From 10a328d5ba114f5c16103c1ff100516e67bba0a9 Mon Sep 17 00:00:00 2001 From: Martin Plicht Date: Sun, 2 Sep 2012 15:39:29 +0200 Subject: [PATCH] mac: Change prefix of Objective-C classes/filenames from Clonk to C4, give xib files names that make more sense --- CMakeLists.txt | 27 +-- src/editor/C4ConsoleCocoa.mm | 28 +-- ...ions.h => C4AppDelegate+MainMenuActions.h} | 4 +- ...ns.mm => C4AppDelegate+MainMenuActions.mm} | 8 +- .../{ClonkAppDelegate.h => C4AppDelegate.h} | 14 +- .../{ClonkAppDelegate.mm => C4AppDelegate.mm} | 12 +- src/platform/C4AppMac.mm | 2 +- ...ontroller.h => C4EditorWindowController.h} | 8 +- ...troller.mm => C4EditorWindowController.mm} | 18 +- .../{ClonkOpenGLView.h => C4OpenGLView.h} | 8 +- .../{ClonkOpenGLView.mm => C4OpenGLView.mm} | 34 ++-- ...indowController.h => C4WindowController.h} | 8 +- ...dowController.mm => C4WindowController.mm} | 20 +-- src/platform/C4WindowMac.mm | 26 +-- src/res/{ConsoleWindow.xib => Editor.xib} | 162 +----------------- ...nsoleGUIWindow.xib => EditorGUIWindow.xib} | 16 +- .../{ClonkWindow.xib => EditorViewport.xib} | 4 +- .../{FullscreenWindow.xib => FullScreen.xib} | 16 +- src/res/MainMenu.xib | 16 +- 19 files changed, 140 insertions(+), 291 deletions(-) rename src/platform/{ClonkMainMenuActions.h => C4AppDelegate+MainMenuActions.h} (90%) rename src/platform/{ClonkMainMenuActions.mm => C4AppDelegate+MainMenuActions.mm} (96%) rename src/platform/{ClonkAppDelegate.h => C4AppDelegate.h} (82%) rename src/platform/{ClonkAppDelegate.mm => C4AppDelegate.mm} (96%) rename src/platform/{ConsoleWindowController.h => C4EditorWindowController.h} (90%) rename src/platform/{ConsoleWindowController.mm => C4EditorWindowController.mm} (89%) rename src/platform/{ClonkOpenGLView.h => C4OpenGLView.h} (90%) rename src/platform/{ClonkOpenGLView.mm => C4OpenGLView.mm} (94%) rename src/platform/{ClonkWindowController.h => C4WindowController.h} (86%) rename src/platform/{ClonkWindowController.mm => C4WindowController.mm} (91%) rename src/res/{ConsoleWindow.xib => Editor.xib} (93%) rename src/res/{ConsoleGUIWindow.xib => EditorGUIWindow.xib} (97%) rename src/res/{ClonkWindow.xib => EditorViewport.xib} (99%) rename src/res/{FullscreenWindow.xib => FullScreen.xib} (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d688f53f1..938e542c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -564,8 +564,8 @@ mark_as_advanced(OC_SYSTEM_SOURCES) if(APPLE) list(APPEND OC_SYSTEM_SOURCES src/platform/C4FileMonitorMac.mm - src/platform/ClonkAppDelegate.h - src/platform/ClonkAppDelegate.mm + src/platform/C4AppDelegate.h + src/platform/C4AppDelegate.mm ) else() list(APPEND OC_SYSTEM_SOURCES @@ -647,14 +647,15 @@ elseif(USE_COCOA) src/editor/C4ConsoleCocoa.mm src/platform/C4AppMac.mm src/platform/C4WindowMac.mm - src/platform/ClonkMainMenuActions.mm - src/platform/ClonkOpenGLView.h - src/platform/ClonkOpenGLView.mm - src/platform/ClonkWindowController.h - src/platform/ClonkWindowController.mm + src/platform/C4AppDelegate+MainMenuActions.h + src/platform/C4AppDelegate+MainMenuActions.mm + src/platform/C4OpenGLView.h + src/platform/C4OpenGLView.mm + src/platform/C4WindowController.h + src/platform/C4WindowController.mm src/platform/CocoaKeycodeMap.h - src/platform/ConsoleWindowController.h - src/platform/ConsoleWindowController.mm + src/platform/C4EditorWindowController.h + src/platform/C4EditorWindowController.mm src/platform/ObjectiveCAssociated.h ) endif() @@ -869,10 +870,10 @@ if(APPLE) src/res/ocd.icns src/res/ocf.icns src/res/ocg.icns src/res/C4P.icns src/res/ocs.icns src/res/ocu.icns src/res/MainMenu.xib - src/res/FullscreenWindow.xib - src/res/ConsoleGUIWindow.xib - src/res/ClonkWindow.xib - src/res/ConsoleWindow.xib + src/res/FullScreen.xib + src/res/EditorGUIWindow.xib + src/res/EditorViewport.xib + src/res/Editor.xib src/res/Mouse_Trans.png src/res/Cursor_Trans.png src/res/Brush_Trans.png diff --git a/src/editor/C4ConsoleCocoa.mm b/src/editor/C4ConsoleCocoa.mm index a32f5e569..ef2d5babb 100644 --- a/src/editor/C4ConsoleCocoa.mm +++ b/src/editor/C4ConsoleCocoa.mm @@ -33,13 +33,13 @@ #include #import -#import "ClonkAppDelegate.h" -#import "ConsoleWindowController.h" -#import "ClonkOpenGLView.h" +#import "C4AppDelegate.h" +#import "C4EditorWindowController.h" +#import "C4OpenGLView.h" // implementation of C4Console GUI for Mac OS X -static inline ConsoleWindowController* ctrler(C4ConsoleGUI* gui) {return gui->objectiveCObject();} +static inline C4EditorWindowController* ctrler(C4ConsoleGUI* gui) {return gui->objectiveCObject();} class C4ConsoleGUI::State: public C4ConsoleGUI::InternalState { @@ -62,7 +62,7 @@ public: C4Window* C4ConsoleGUI::CreateConsoleWindow(C4AbstractApp *application) { - ClonkWindowController* controller = [ConsoleWindowController new]; + C4WindowController* controller = [C4EditorWindowController new]; setObjectiveCObject(controller); [NSBundle loadNibNamed:@"ConsoleWindow" owner:controller]; [controller setStdWindow:this]; @@ -72,7 +72,7 @@ C4Window* C4ConsoleGUI::CreateConsoleWindow(C4AbstractApp *application) void C4ConsoleGUI::Out(const char* message) { - ConsoleWindowController* controller = ctrler(this); + C4EditorWindowController* controller = ctrler(this); if (controller) { NSTextStorage* textStorage = controller.outputTextView.textStorage; @@ -133,16 +133,16 @@ bool C4ConsoleGUI::FileSelect(StdStrBuf *sFilename, const char * szFilter, DWORD void C4ConsoleGUI::AddMenuItemForPlayer(C4Player* player, StdStrBuf& player_text) { NSMenuItem* item = [ - [ClonkAppDelegate instance].addViewportForPlayerMenuItem.submenu + [C4AppDelegate instance].addViewportForPlayerMenuItem.submenu addItemWithTitle:[NSString stringWithUTF8String:player_text.getData()] action:@selector(newViewportForPlayer:) keyEquivalent:@"" ]; [item setTag:player->Number]; - [item setTarget: ClonkAppDelegate.instance]; + [item setTarget: C4AppDelegate.instance]; } void C4ConsoleGUI::ClearViewportMenu() { - [[ClonkAppDelegate instance].addViewportForPlayerMenuItem.submenu removeAllItems]; + [[C4AppDelegate instance].addViewportForPlayerMenuItem.submenu removeAllItems]; } bool C4ConsoleGUI::Message(const char *message, bool query) @@ -380,17 +380,17 @@ void C4ConsoleGUI::SetCursor(C4ConsoleGUI::Cursor cursor) void C4ConsoleGUI::RecordingEnabled() { - [ClonkAppDelegate.instance.recordMenuItem setEnabled:NO]; + [C4AppDelegate.instance.recordMenuItem setEnabled:NO]; } void C4ConsoleGUI::AddNetMenu() { - [ClonkAppDelegate.instance.netMenu setHidden:NO]; + [C4AppDelegate.instance.netMenu setHidden:NO]; } void C4ConsoleGUI::ClearNetMenu() { - [ClonkAppDelegate.instance.netMenu setHidden:YES]; + [C4AppDelegate.instance.netMenu setHidden:YES]; } void C4ConsoleGUI::DoEnableControls(bool fEnable) @@ -421,7 +421,7 @@ void C4ConsoleGUI::AddNetMenuItemForPlayer(int32_t index, StdStrBuf &text) { NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithCString:text.getData() encoding:NSUTF8StringEncoding] action:@selector(kickPlayer:) keyEquivalent:[NSString string]]; [item setTarget:ctrler(this)]; - [ClonkAppDelegate.instance.netMenu.submenu addItem:item]; + [C4AppDelegate.instance.netMenu.submenu addItem:item]; } void C4ConsoleGUI::SetInputFunctions(std::list &functions) @@ -431,7 +431,7 @@ void C4ConsoleGUI::SetInputFunctions(std::list &functions) void C4ConsoleGUI::AddKickPlayerMenuItem(C4Player *player, StdStrBuf& player_text, bool enabled) { NSMenuItem* item = [ - [ClonkAppDelegate instance].kickPlayerMenuItem.submenu + [C4AppDelegate instance].kickPlayerMenuItem.submenu addItemWithTitle:[NSString stringWithUTF8String:player_text.getData()] action:@selector(kickPlayer:) keyEquivalent:@"" ]; [item setEnabled:enabled]; diff --git a/src/platform/ClonkMainMenuActions.h b/src/platform/C4AppDelegate+MainMenuActions.h similarity index 90% rename from src/platform/ClonkMainMenuActions.h rename to src/platform/C4AppDelegate+MainMenuActions.h index 35fe72e12..720e056df 100644 --- a/src/platform/ClonkMainMenuActions.h +++ b/src/platform/C4AppDelegate+MainMenuActions.h @@ -1,7 +1,7 @@ #import -#import "ClonkAppDelegate.h" +#import "C4AppDelegate.h" -@interface ClonkAppDelegate (ClonkMainMenuActions) +@interface C4AppDelegate (MainMenuActions) - (IBAction) openScenario:(id)sender; - (IBAction) openScenarioWithPlayers:(id)sender; - (IBAction) closeScenario:(id)sender; diff --git a/src/platform/ClonkMainMenuActions.mm b/src/platform/C4AppDelegate+MainMenuActions.mm similarity index 96% rename from src/platform/ClonkMainMenuActions.mm rename to src/platform/C4AppDelegate+MainMenuActions.mm index c17591f7c..6d7d85c9e 100644 --- a/src/platform/ClonkMainMenuActions.mm +++ b/src/platform/C4AppDelegate+MainMenuActions.mm @@ -22,11 +22,11 @@ #import -#import "ClonkMainMenuActions.h" -#import "ClonkOpenGLView.h" -#import "ConsoleWindowController.h" +#import "C4AppDelegate+MainMenuActions.h" +#import "C4OpenGLView.h" +#import "C4EditorWindowController.h" -@implementation ClonkAppDelegate (ClonkMainMenuActions) +@implementation C4AppDelegate (MainMenuActions) - (IBAction) openScenario:(id)sender { diff --git a/src/platform/ClonkAppDelegate.h b/src/platform/C4AppDelegate.h similarity index 82% rename from src/platform/ClonkAppDelegate.h rename to src/platform/C4AppDelegate.h index d5cf4dbe1..66dbe04a9 100644 --- a/src/platform/ClonkAppDelegate.h +++ b/src/platform/C4AppDelegate.h @@ -23,16 +23,16 @@ #import #ifdef USE_COCOA -#import "ConsoleWindowController.h" +#import "C4EditorWindowController.h" #endif -@interface ClonkAppDelegate: NSObject +@interface C4AppDelegate: NSObject { NSMutableArray *gatheredArguments; NSString *clonkDirectory; NSString *addonSupplied; - ConsoleWindowController *consoleController; - ClonkWindowController *gameWindowController; + C4EditorWindowController *consoleController; + C4WindowController *gameWindowController; BOOL running; std::vector args; } @@ -42,14 +42,14 @@ - (BOOL)installAddOn; - (void)terminate:(NSApplication*)sender; -+ (ClonkAppDelegate*) instance; ++ (C4AppDelegate*) instance; + (BOOL) isEditorAndGameRunning; #ifdef USE_COCOA @property(weak, readonly) NSMenuItem* addViewportForPlayerMenuItem; @property(weak, readonly) NSMenuItem* kickPlayerMenuItem; -@property(readwrite, strong) ConsoleWindowController* consoleController; -@property(readwrite, strong) ClonkWindowController* gameWindowController; +@property(readwrite, strong) C4EditorWindowController* consoleController; +@property(readwrite, strong) C4WindowController* gameWindowController; @property(weak, readonly) NSMenuItem* recordMenuItem; @property(weak, readonly) NSMenuItem* netMenu; @property(weak) NSMenuItem* toggleFullScreen; diff --git a/src/platform/ClonkAppDelegate.mm b/src/platform/C4AppDelegate.mm similarity index 96% rename from src/platform/ClonkAppDelegate.mm rename to src/platform/C4AppDelegate.mm index 9eac7dcee..01c7d13c8 100644 --- a/src/platform/ClonkAppDelegate.mm +++ b/src/platform/C4AppDelegate.mm @@ -12,25 +12,25 @@ * "Clonk" is a registered trademark of Matthes Bender. * See clonk_trademark_license.txt for full license. */ -// Roughly adapted from the original ClonkAppDelegate.m; haxxed to death by teh Gurkendoktor. +// Roughly adapted from the original C4AppDelegate.m; haxxed to death by teh Gurkendoktor. // Look at main() to get an idea for what happens here. #include #include #include -#import "ClonkAppDelegate.h" -#import "ClonkMainMenuActions.h" +#import "C4AppDelegate.h" +#import "C4AppDelegate+MainMenuActions.h" #ifdef USE_SDL_MAINLOOP #import "SDL/SDL.h" #endif /* The main class of the application, the application's delegate */ -@implementation ClonkAppDelegate +@implementation C4AppDelegate -+ (ClonkAppDelegate*) instance; ++ (C4AppDelegate*) instance; { - return (ClonkAppDelegate*)[[NSApplication sharedApplication] delegate]; + return (C4AppDelegate*)[[NSApplication sharedApplication] delegate]; } + (BOOL) isEditorAndGameRunning diff --git a/src/platform/C4AppMac.mm b/src/platform/C4AppMac.mm index 9cdca2110..fdffe7cca 100644 --- a/src/platform/C4AppMac.mm +++ b/src/platform/C4AppMac.mm @@ -21,7 +21,7 @@ #include #import -#import "ClonkWindowController.h" +#import "C4WindowController.h" #include #include diff --git a/src/platform/ConsoleWindowController.h b/src/platform/C4EditorWindowController.h similarity index 90% rename from src/platform/ConsoleWindowController.h rename to src/platform/C4EditorWindowController.h index 996847c37..1bf657c4e 100644 --- a/src/platform/ConsoleWindowController.h +++ b/src/platform/C4EditorWindowController.h @@ -16,14 +16,14 @@ #import #import -#import +#import #ifdef USE_COCOA -@class ClonkOpenGLView; -@class ClonkAppDelegate; +@class C4OpenGLView; +@class C4AppDelegate; -@interface ConsoleWindowController : ClonkWindowController {} +@interface C4EditorWindowController : C4WindowController {} @property NSTextField* frameLabel; @property NSTextField* timeLabel; @property NSTextView* outputTextView; diff --git a/src/platform/ConsoleWindowController.mm b/src/platform/C4EditorWindowController.mm similarity index 89% rename from src/platform/ConsoleWindowController.mm rename to src/platform/C4EditorWindowController.mm index 207129d9b..f0f55c329 100644 --- a/src/platform/ConsoleWindowController.mm +++ b/src/platform/C4EditorWindowController.mm @@ -20,13 +20,13 @@ #include #import -#import -#import -#import +#import +#import +#import #ifdef USE_COCOA -@implementation ConsoleWindowController +@implementation C4EditorWindowController @synthesize frameLabel, timeLabel, outputTextView, objectPropertiesText, @@ -36,7 +36,7 @@ - (void) awakeFromNib { [super awakeFromNib]; - ClonkAppDelegate.instance.consoleController = self; + C4AppDelegate.instance.consoleController = self; NSWindow* window = self.window; [window makeKeyAndOrderFront:self]; [window makeMainWindow]; @@ -71,7 +71,7 @@ int indexFromSender(id sender) Console.EditCursor.SetMode(indexFromSender(sender)); for (NSWindow* w in [[NSApplication sharedApplication] windows]) { - if ([[w windowController] isKindOfClass:[ClonkWindowController class]]) + if ([[w windowController] isKindOfClass:[C4WindowController class]]) { [w invalidateCursorRectsForView:[[w windowController] openGLView]]; } @@ -123,14 +123,14 @@ int indexFromSender(id sender) - (IBAction) consoleIn:(id)sender { - if (![ClonkAppDelegate isEditorAndGameRunning]) + if (![C4AppDelegate isEditorAndGameRunning]) return; Console.In([[consoleCombo stringValue] cStringUsingEncoding:NSUTF8StringEncoding]); } - (IBAction) objectIn:(id)sender { - if (![ClonkAppDelegate isEditorAndGameRunning]) + if (![C4AppDelegate isEditorAndGameRunning]) return; Console.EditCursor.In([[objectCombo stringValue] cStringUsingEncoding:NSUTF8StringEncoding]); } @@ -157,7 +157,7 @@ int indexFromSender(id sender) while ((s = gameRunningInConsoleModeSelectors[i++]) != nil) { if (s == [item action]) - return [ClonkAppDelegate isEditorAndGameRunning]; + return [C4AppDelegate isEditorAndGameRunning]; } // always enabled diff --git a/src/platform/ClonkOpenGLView.h b/src/platform/C4OpenGLView.h similarity index 90% rename from src/platform/ClonkOpenGLView.h rename to src/platform/C4OpenGLView.h index 309bc049a..6868b0848 100644 --- a/src/platform/ClonkOpenGLView.h +++ b/src/platform/C4OpenGLView.h @@ -19,15 +19,15 @@ #ifdef USE_COCOA -@class ClonkWindowController; +@class C4WindowController; -@interface ClonkOpenGLView : NSView +@interface C4OpenGLView : NSView { @private NSOpenGLContext* context; CGPoint savedMouse; } -- (ClonkWindowController*) controller; +- (C4WindowController*) controller; - (void)update; - (void) enableEvents; - (void) showCursor; @@ -44,7 +44,7 @@ @property(readwrite, strong) NSOpenGLContext* context; @end -@interface ClonkEditorOpenGLView: ClonkOpenGLView +@interface C4EditorOpenGLView: C4OpenGLView { } - (IBAction) grabContents:(id) sender; diff --git a/src/platform/ClonkOpenGLView.mm b/src/platform/C4OpenGLView.mm similarity index 94% rename from src/platform/ClonkOpenGLView.mm rename to src/platform/C4OpenGLView.mm index 31c4f772c..e6cdbc36e 100644 --- a/src/platform/ClonkOpenGLView.mm +++ b/src/platform/C4OpenGLView.mm @@ -28,13 +28,13 @@ #include -#import "ClonkOpenGLView.h" -#import "ClonkWindowController.h" -#import "ClonkMainMenuActions.h" +#import "C4OpenGLView.h" +#import "C4WindowController.h" +#import "C4AppDelegate+MainMenuActions.h" #ifdef USE_COCOA -@implementation ClonkOpenGLView +@implementation C4OpenGLView @synthesize context; @@ -129,7 +129,7 @@ glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); } -- (ClonkWindowController*) controller {return (ClonkWindowController*)[self.window delegate];} +- (C4WindowController*) controller {return (C4WindowController*)[self.window delegate];} int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags) { @@ -276,9 +276,9 @@ int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags) { // swiping left triggers going back in startup dialogs if (event.deltaX > 0) - [ClonkAppDelegate.instance simulateKeyPressed:K_LEFT]; + [C4AppDelegate.instance simulateKeyPressed:K_LEFT]; else - [ClonkAppDelegate.instance simulateKeyPressed:K_RIGHT]; + [C4AppDelegate.instance simulateKeyPressed:K_RIGHT]; } - (void)insertText:(id)insertString @@ -432,7 +432,7 @@ int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags) - (void) setContextSurfaceBackingSizeToOwnDimensions { - [ClonkOpenGLView setSurfaceBackingSizeOf:self.context width:self.frame.size.width height:self.frame.size.height]; + [C4OpenGLView setSurfaceBackingSizeOf:self.context width:self.frame.size.width height:self.frame.size.height]; } static NSOpenGLContext* MainContext; @@ -477,7 +477,7 @@ static NSOpenGLContext* MainContext; @end -@implementation ClonkEditorOpenGLView +@implementation C4EditorOpenGLView - (void) copy:(id) sender { @@ -526,19 +526,19 @@ void CStdGLCtx::Clear() void C4Window::EnumerateMultiSamples(std::vector& samples) const { - [ClonkOpenGLView enumerateMultiSamples:samples]; + [C4OpenGLView enumerateMultiSamples:samples]; } bool C4AbstractApp::SetVideoMode(unsigned int iXRes, unsigned int iYRes, unsigned int iColorDepth, unsigned int iRefreshRate, unsigned int iMonitor, bool fFullScreen) { fFullScreen &= !lionAndBeyond(); // Always false for Lion since then Lion's true(tm) Fullscreen is used - ClonkWindowController* controller = pWindow->objectiveCObject(); + C4WindowController* controller = pWindow->objectiveCObject(); NSWindow* window = controller.window; if (iXRes == -1 && iYRes == -1) { - iXRes = CGDisplayPixelsWide(ClonkOpenGLView.displayID); - iYRes = CGDisplayPixelsHigh(ClonkOpenGLView.displayID); + iXRes = CGDisplayPixelsWide(C4OpenGLView.displayID); + iYRes = CGDisplayPixelsHigh(C4OpenGLView.displayID); } pWindow->SetSize(iXRes, iYRes); [controller setFullscreen:fFullScreen]; @@ -558,7 +558,7 @@ bool CStdGLCtx::Init(C4Window * pWindow, C4AbstractApp *) this->pWindow = pWindow; // Create Context with sharing (if this is the main context, our ctx will be 0, so no sharing) // try direct rendering first - NSOpenGLContext* ctx = [ClonkOpenGLView createContext:pGL->pMainCtx]; + NSOpenGLContext* ctx = [C4OpenGLView createContext:pGL->pMainCtx]; setObjectiveCObject(ctx); // No luck at all? if (!Select(true)) return pGL->Error(" gl: Unable to select context"); @@ -570,7 +570,7 @@ bool CStdGLCtx::Init(C4Window * pWindow, C4AbstractApp *) return pGL->Error(reinterpret_cast(glewGetErrorString(err))); } // set the openglview's context - auto controller = pWindow->objectiveCObject(); + auto controller = pWindow->objectiveCObject(); if (controller && controller.openGLView) { [controller.openGLView setContext:ctx]; @@ -625,7 +625,7 @@ bool C4AbstractApp::ApplyGammaRamp(struct _D3DGAMMARAMP &ramp, bool fForce) g[i] = static_cast(ramp.green[i])/65535.0; b[i] = static_cast(ramp.blue[i])/65535.0; } - CGSetDisplayTransferByTable(ClonkOpenGLView.displayID, 256, r, g, b); + CGSetDisplayTransferByTable(C4OpenGLView.displayID, 256, r, g, b); return true; } @@ -635,7 +635,7 @@ bool C4AbstractApp::SaveDefaultGammaRamp(_D3DGAMMARAMP &ramp) CGGammaValue g[256]; CGGammaValue b[256]; uint32_t count; - CGGetDisplayTransferByTable(ClonkOpenGLView.displayID, 256, r, g, b, &count); + CGGetDisplayTransferByTable(C4OpenGLView.displayID, 256, r, g, b, &count); for (int i = 0; i < 256; i++) { ramp.red[i] = r[i]*65535; diff --git a/src/platform/ClonkWindowController.h b/src/platform/C4WindowController.h similarity index 86% rename from src/platform/ClonkWindowController.h rename to src/platform/C4WindowController.h index be121afec..23987a12c 100644 --- a/src/platform/ClonkWindowController.h +++ b/src/platform/C4WindowController.h @@ -20,13 +20,13 @@ class C4Window; class C4ViewportWindow; class C4Viewport; -@class ClonkOpenGLView; +@class C4OpenGLView; @class NSTextView; -@class ConsoleWindowController; +@class C4EditorWindowController; bool lionAndBeyond(); -@interface ClonkWindowController : NSWindowController { +@interface C4WindowController : NSWindowController { NSWindow* fullscreenWindow; NSSize preferredContentSize; } @@ -39,7 +39,7 @@ bool lionAndBeyond(); - (IBAction) scroll:(id)sender; @property (readwrite) C4Window* stdWindow; -@property (weak) ClonkOpenGLView* openGLView; +@property (weak) C4OpenGLView* openGLView; @property (weak) NSScrollView* scrollView; @property (readonly) BOOL isLiveResizing; @end diff --git a/src/platform/ClonkWindowController.mm b/src/platform/C4WindowController.mm similarity index 91% rename from src/platform/ClonkWindowController.mm rename to src/platform/C4WindowController.mm index ea0e319f2..06e0c7f97 100644 --- a/src/platform/ClonkWindowController.mm +++ b/src/platform/C4WindowController.mm @@ -24,10 +24,10 @@ #import -#import "ClonkWindowController.h" -#import "ClonkOpenGLView.h" -#import "ConsoleWindowController.h" -#import "ClonkAppDelegate.h" +#import "C4WindowController.h" +#import "C4OpenGLView.h" +#import "C4EditorWindowController.h" +#import "C4AppDelegate.h" #import "AppKit/NSOpenGL.h" static SInt32 osVersion() @@ -55,7 +55,7 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;} } @end -@implementation ClonkWindowController +@implementation C4WindowController @synthesize stdWindow, openGLView, scrollView; @@ -63,7 +63,7 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;} { [super awakeFromNib]; if (!Application.isEditor) - ClonkAppDelegate.instance.gameWindowController = self; + C4AppDelegate.instance.gameWindowController = self; } - (void) fadeOut:(CGDisplayFadeReservationToken*)token @@ -179,7 +179,7 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;} { /* NSSize newRes = openGLView.frame.size; - [ClonkOpenGLView setSurfaceBackingSizeOf:ClonkOpenGLView.mainContext width:newRes.width height:newRes.height]; + [C4OpenGLView setSurfaceBackingSizeOf:C4OpenGLView.mainContext width:newRes.width height:newRes.height]; Config.Graphics.ResX = newRes.width; Config.Graphics.ResY = newRes.height; */ } @@ -252,7 +252,7 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;} bool C4Viewport::ScrollBarsByViewPosition() { if (PlayerLock) return false; - NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; + NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; [scrollView.horizontalScroller setToLandscapeCoordinate:ViewX size:GBackWdt viewportSize:ViewWdt zoom:GetZoom()]; [scrollView.verticalScroller setToLandscapeCoordinate:ViewY size:GBackHgt viewportSize:ViewHgt zoom:GetZoom()]; return true; @@ -260,7 +260,7 @@ bool C4Viewport::ScrollBarsByViewPosition() bool C4Viewport::ViewPositionByScrollBars() { - NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; + NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; ViewX = [scrollView.horizontalScroller landscapeCoordinateForSize:GBackWdt viewportSize:ViewWdt zoom:GetZoom()]; ViewY = [scrollView.verticalScroller landscapeCoordinateForSize:GBackHgt viewportSize:ViewHgt zoom:GetZoom()]; return true; @@ -268,7 +268,7 @@ bool C4Viewport::ViewPositionByScrollBars() bool C4Viewport::TogglePlayerLock() { - NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; + NSScrollView* scrollView = pWindow->objectiveCObject().scrollView; if (PlayerLock) { PlayerLock = false; diff --git a/src/platform/C4WindowMac.mm b/src/platform/C4WindowMac.mm index b459fa742..5c3841bfb 100644 --- a/src/platform/C4WindowMac.mm +++ b/src/platform/C4WindowMac.mm @@ -21,12 +21,12 @@ #include #import -#import -#import +#import +#import #ifdef USE_COCOA -#define ctrler (this->objectiveCObject()) +#define ctrler (this->objectiveCObject()) C4Window::C4Window (): Active(false), @@ -35,17 +35,17 @@ C4Window::C4Window (): C4Window::~C4Window () {} -static NSString* windowNibNameForWindowKind(C4Window::WindowKind kind) +static NSString* windowXibNameForWindowKind(C4Window::WindowKind kind) { switch (kind) { case C4Window::W_GuiWindow: case C4Window::W_Console: - return @"ConsoleGUIWindow"; + return @"EditorGUIWindow"; case C4Window::W_Fullscreen: - return @"FullscreenWindow"; + return @"FullScreen"; case C4Window::W_Viewport: - return @"ClonkWindow"; + return @"EditorViewport"; default: return nil; } @@ -56,9 +56,9 @@ C4Window * C4Window::Init(C4Window::WindowKind windowKind, C4AbstractApp * pApp, Active = true; // Create window - ClonkWindowController* controller = [ClonkWindowController new]; + C4WindowController* controller = [C4WindowController new]; setObjectiveCObject(controller); - [NSBundle loadNibNamed:windowNibNameForWindowKind(windowKind) owner:controller]; + [NSBundle loadNibNamed:windowXibNameForWindowKind(windowKind) owner:controller]; [controller setStdWindow:this]; if (windowKind != W_GuiWindow && windowKind != W_Console) { @@ -72,7 +72,7 @@ C4Window * C4Window::Init(C4Window::WindowKind windowKind, C4AbstractApp * pApp, void C4Window::Clear() { // Destroy window - ClonkWindowController* controller = ctrler; + C4WindowController* controller = ctrler; if (controller) { [controller.openGLView setNeedsDisplay:NO]; @@ -101,14 +101,14 @@ bool C4Window::RestorePosition(const char *szWindowName, const char *szSubKey, b void C4Window::SetTitle(const char *szToTitle) { - ClonkWindowController* controller; + C4WindowController* controller; if ((controller = ctrler) && controller.window) [controller.window setTitle:[NSString stringWithUTF8String:szToTitle ? szToTitle : ""]]; } bool C4Window::GetSize(C4Rect * pRect) { - ClonkWindowController* controller = ctrler; + C4WindowController* controller = ctrler; NSView* view = controller.openGLView ? controller.openGLView : controller.window.contentView; NSRect r = [view frame]; pRect->x = 0; @@ -120,7 +120,7 @@ bool C4Window::GetSize(C4Rect * pRect) void C4Window::SetSize(unsigned int cx, unsigned int cy) { - ClonkWindowController* controller = ctrler; + C4WindowController* controller = ctrler; [controller setContentSize:NSMakeSize(cx, cy)]; } diff --git a/src/res/ConsoleWindow.xib b/src/res/Editor.xib similarity index 93% rename from src/res/ConsoleWindow.xib rename to src/res/Editor.xib index 62727b5e4..8d906ccd2 100644 --- a/src/res/ConsoleWindow.xib +++ b/src/res/Editor.xib @@ -325,7 +325,6 @@ 292 {{6, 0}, {118, 17}} - YES @@ -363,7 +362,6 @@ 290 {{126, 0}, {140, 17}} - YES 68288064 @@ -385,7 +383,6 @@ 290 {{20, 7}, {348, 26}} - YES @@ -497,8 +494,7 @@ 2322 {441, 14} - - + @@ -580,7 +576,6 @@ {{1, 1}, {435, 338}} - @@ -612,7 +607,6 @@ 256 {{421, 1}, {15, 338}} - _doScroller: @@ -624,7 +618,6 @@ -2147483392 {{-100, -100}, {87, 18}} - YES 1 @@ -636,8 +629,7 @@ {{0, 40}, {437, 340}} - - + 133266 @@ -648,7 +640,6 @@ 289 {{373, 10}, {55, 24}} - YES @@ -668,14 +659,12 @@ {{0, 20}, {437, 380}} - NSView {437, 400} - {{0, 0}, {1920, 1058}} @@ -1045,8 +1034,7 @@ 2322 {355, 14} - - + @@ -1112,7 +1100,6 @@ {{1, 1}, {355, 112}} - @@ -1124,7 +1111,6 @@ 256 {{341, 1}, {15, 112}} - _doScroller: @@ -1135,7 +1121,6 @@ -2147483392 {{-100, -100}, {87, 18}} - 1 @@ -1146,8 +1131,7 @@ {{12, 44}, {357, 114}} - - + 133138 @@ -1158,7 +1142,6 @@ 289 {{336, 14}, {33, 23}} - YES -2080244224 @@ -1179,7 +1162,6 @@ 290 {{12, 13}, {319, 26}} - YES @@ -1254,7 +1236,6 @@ {389, 178} - {{0, 0}, {1920, 1058}} @@ -2127,140 +2108,7 @@ 323 - - - YES - - ClonkWindowController - NSWindowController - - scroll: - id - - - scroll: - - scroll: - id - - - - IBProjectSource - ./Classes/ClonkWindowController.h - - - - ConsoleWindowController - ClonkWindowController - - YES - - YES - consoleIn: - halt: - kickPlayer: - objectIn: - play: - selectIFT: - selectLandscapeMode: - selectMaterial: - selectMode: - selectTexture: - selectTool: - setGrade: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - consoleIn: - halt: - kickPlayer: - objectIn: - play: - selectIFT: - selectLandscapeMode: - selectMaterial: - selectMode: - selectTexture: - selectTool: - setGrade: - - - YES - - consoleIn: - id - - - halt: - id - - - kickPlayer: - id - - - objectIn: - id - - - play: - id - - - selectIFT: - id - - - selectLandscapeMode: - id - - - selectMaterial: - id - - - selectMode: - id - - - selectTexture: - id - - - selectTool: - id - - - setGrade: - id - - - - - IBProjectSource - ./Classes/ConsoleWindowController.h - - - - + 0 IBCocoaFramework diff --git a/src/res/ConsoleGUIWindow.xib b/src/res/EditorGUIWindow.xib similarity index 97% rename from src/res/ConsoleGUIWindow.xib rename to src/res/EditorGUIWindow.xib index aa679f286..5d3564453 100644 --- a/src/res/ConsoleGUIWindow.xib +++ b/src/res/EditorGUIWindow.xib @@ -30,7 +30,7 @@ YES - ClonkWindowController + C4WindowController FirstResponder @@ -57,7 +57,7 @@ 274 {480, 270} - ClonkOpenGLView + C4OpenGLView {480, 270} @@ -190,15 +190,15 @@ YES - ClonkOpenGLView + C4OpenGLView NSView IBProjectSource - src/platform/ClonkOpenGLView.h + src/platform/C4OpenGLView.h - ClonkWindowController + C4WindowController NSWindowController scroll: @@ -220,7 +220,7 @@ YES - ClonkOpenGLView + C4OpenGLView NSScrollView @@ -235,7 +235,7 @@ YES openGLView - ClonkOpenGLView + C4OpenGLView scrollView @@ -245,7 +245,7 @@ IBProjectSource - src/platform/ClonkWindowController.h + src/platform/C4WindowController.h diff --git a/src/res/ClonkWindow.xib b/src/res/EditorViewport.xib similarity index 99% rename from src/res/ClonkWindow.xib rename to src/res/EditorViewport.xib index fafc39faa..4472df729 100644 --- a/src/res/ClonkWindow.xib +++ b/src/res/EditorViewport.xib @@ -30,7 +30,7 @@ YES - ClonkWindowController + C4WindowController FirstResponder @@ -68,7 +68,7 @@ {480, 270} YES - ClonkEditorOpenGLView + C4EditorOpenGLView {{1, 1}, {480, 270}} diff --git a/src/res/FullscreenWindow.xib b/src/res/FullScreen.xib similarity index 95% rename from src/res/FullscreenWindow.xib rename to src/res/FullScreen.xib index bc7e7972e..73e3f784a 100644 --- a/src/res/FullscreenWindow.xib +++ b/src/res/FullScreen.xib @@ -30,7 +30,7 @@ YES - ClonkWindowController + C4WindowController FirstResponder @@ -152,7 +152,7 @@ {196, 240} {{202, 428}, {480, 270}} - ClonkOpenGLView + C4OpenGLView com.apple.InterfaceBuilder.CocoaPlugin @@ -178,15 +178,15 @@ YES - ClonkOpenGLView + C4OpenGLView NSView IBProjectSource - ../../src/platform/ClonkOpenGLView.h + ../../src/platform/C4OpenGLView.h - ClonkWindowController + C4WindowController NSWindowController scroll: @@ -208,7 +208,7 @@ YES - ClonkOpenGLView + C4OpenGLView NSScrollView @@ -223,7 +223,7 @@ YES openGLView - ClonkOpenGLView + C4OpenGLView scrollView @@ -233,7 +233,7 @@ IBProjectSource - ../../src/platform/ClonkWindowController.h + ../../src/platform/C4WindowController.h diff --git a/src/res/MainMenu.xib b/src/res/MainMenu.xib index 7a1ec9332..b1b93ed2b 100644 --- a/src/res/MainMenu.xib +++ b/src/res/MainMenu.xib @@ -995,7 +995,7 @@ NSFontManager - ClonkAppDelegate + C4AppDelegate YES @@ -2641,7 +2641,7 @@ YES - ClonkAppDelegate + C4AppDelegate NSObject YES @@ -2842,12 +2842,12 @@ IBProjectSource - ./Classes/ClonkAppDelegate.h + ./Classes/C4AppDelegate.h - ClonkEditorOpenGLView - ClonkOpenGLView + C4EditorOpenGLView + C4OpenGLView YES @@ -2910,15 +2910,15 @@ IBProjectSource - ./Classes/ClonkEditorOpenGLView.h + ./Classes/C4EditorOpenGLView.h - ClonkOpenGLView + C4OpenGLView NSView IBProjectSource - ./Classes/ClonkOpenGLView.h + ./Classes/C4OpenGLView.h