marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac: Change prefix of Objective-C classes/filenames from Clonk to C4, give xib files names that make more sense

floating-point
Martin Plicht 2012-09-02 15:39:29 +02:00
parent f389fd230c
commit 10a328d5ba
19 changed files with 140 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -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

28
src/editor/C4ConsoleCocoa.mm
View File

@ -33,13 +33,13 @@
#include <StdRegistry.h>
#import <Cocoa/Cocoa.h>
#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<ConsoleWindowController>();}
static inline C4EditorWindowController* ctrler(C4ConsoleGUI* gui) {return gui->objectiveCObject<C4EditorWindowController>();}
class C4ConsoleGUI::State: public C4ConsoleGUI::InternalState<class C4ConsoleGUI>
{
@ -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<const char*> &functions)
@ -431,7 +431,7 @@ void C4ConsoleGUI::SetInputFunctions(std::list<const char*> &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];

4
src/platform/ClonkMainMenuActions.h → src/platform/C4AppDelegate+MainMenuActions.h
View File

@ -1,7 +1,7 @@
#import <Cocoa/Cocoa.h>
#import "ClonkAppDelegate.h"
#import "C4AppDelegate.h"
@interface ClonkAppDelegate (ClonkMainMenuActions)
@interface C4AppDelegate (MainMenuActions)
- (IBAction) openScenario:(id)sender;
- (IBAction) openScenarioWithPlayers:(id)sender;
- (IBAction) closeScenario:(id)sender;

8
src/platform/ClonkMainMenuActions.mm → src/platform/C4AppDelegate+MainMenuActions.mm
View File

@ -22,11 +22,11 @@
#import <C4DrawGL.h>
#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
{

14
src/platform/ClonkAppDelegate.h → src/platform/C4AppDelegate.h
View File

@ -23,16 +23,16 @@
#import <Cocoa/Cocoa.h>
#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<char*> 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;

12
src/platform/ClonkAppDelegate.mm → src/platform/C4AppDelegate.mm
View File

@ -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 <C4Include.h>
#include <C4Application.h>
#include <C4Game.h>
#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

2
src/platform/C4AppMac.mm
View File

@ -21,7 +21,7 @@
#include <GL/glew.h>
#import <Cocoa/Cocoa.h>
#import "ClonkWindowController.h"
#import "C4WindowController.h"
#include <C4Include.h>
#include <C4Window.h>

8
src/platform/ConsoleWindowController.h → src/platform/C4EditorWindowController.h
View File

@ -16,14 +16,14 @@
#import <AppKit/AppKit.h>
#import <Quartz/Quartz.h>
#import <ClonkWindowController.h>
#import <C4WindowController.h>
#ifdef USE_COCOA
@class ClonkOpenGLView;
@class ClonkAppDelegate;
@class C4OpenGLView;
@class C4AppDelegate;
@interface ConsoleWindowController : ClonkWindowController<NSUserInterfaceValidations> {}
@interface C4EditorWindowController : C4WindowController<NSUserInterfaceValidations> {}
@property NSTextField* frameLabel;
@property NSTextField* timeLabel;
@property NSTextView* outputTextView;

18
src/platform/ConsoleWindowController.mm → src/platform/C4EditorWindowController.mm
View File

@ -20,13 +20,13 @@
#include <C4Game.h>
#import <Cocoa/Cocoa.h>
#import <ConsoleWindowController.h>
#import <ClonkOpenGLView.h>
#import <ClonkAppDelegate.h>
#import <C4EditorWindowController.h>
#import <C4OpenGLView.h>
#import <C4AppDelegate.h>
#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

8
src/platform/ClonkOpenGLView.h → src/platform/C4OpenGLView.h
View File

@ -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;

34
src/platform/ClonkOpenGLView.mm → src/platform/C4OpenGLView.mm
View File

@ -28,13 +28,13 @@
#include <C4DrawGL.h>
#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<int>& 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<ClonkWindowController>();
C4WindowController* controller = pWindow->objectiveCObject<C4WindowController>();
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<const char*>(glewGetErrorString(err)));
}
// set the openglview's context
auto controller = pWindow->objectiveCObject<ClonkWindowController>();
auto controller = pWindow->objectiveCObject<C4WindowController>();
if (controller && controller.openGLView)
{
[controller.openGLView setContext:ctx];
@ -625,7 +625,7 @@ bool C4AbstractApp::ApplyGammaRamp(struct _D3DGAMMARAMP &ramp, bool fForce)
g[i] = static_cast<float>(ramp.green[i])/65535.0;
b[i] = static_cast<float>(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;

8
src/platform/ClonkWindowController.h → src/platform/C4WindowController.h
View File

@ -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<NSWindowDelegate> {
@interface C4WindowController : NSWindowController<NSWindowDelegate> {
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

20
src/platform/ClonkWindowController.mm → src/platform/C4WindowController.mm
View File

@ -24,10 +24,10 @@
#import <C4DrawGL.h>
#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<ClonkWindowController>().scrollView;
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().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<ClonkWindowController>().scrollView;
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().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<ClonkWindowController>().scrollView;
NSScrollView* scrollView = pWindow->objectiveCObject<C4WindowController>().scrollView;
if (PlayerLock)
{
PlayerLock = false;

26
src/platform/C4WindowMac.mm
View File

@ -21,12 +21,12 @@
#include <C4Rect.h>
#import <Appkit/AppKit.h>
#import <ClonkWindowController.h>
#import <ClonkOpenGLView.h>
#import <C4WindowController.h>
#import <C4OpenGLView.h>
#ifdef USE_COCOA
#define ctrler (this->objectiveCObject<ClonkWindowController>())
#define ctrler (this->objectiveCObject<C4WindowController>())
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)];
}

162
src/res/ConsoleWindow.xib → src/res/Editor.xib
View File

@ -325,7 +325,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{6, 0}, {118, 17}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="977182517"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="926896742">
@ -363,7 +362,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{126, 0}, {140, 17}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="750969160">
<int key="NSCellFlags">68288064</int>
@ -385,7 +383,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{20, 7}, {348, 26}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="578982566"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="136936318">
@ -497,8 +494,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{441, 14}</string>
<reference key="NSSuperview" ref="90778228"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="508855094"/>
<reference key="NSNextKeyView" ref="67614164"/>
<object class="NSTextContainer" key="NSTextContainer" id="45296395">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@ -580,7 +576,6 @@
</object>
<string key="NSFrame">{{1, 1}, {435, 338}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1053662704"/>
<reference key="NSDocView" ref="1053662704"/>
<reference key="NSBGColor" ref="923521988"/>
@ -612,7 +607,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{421, 1}, {15, 338}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="665421576"/>
<reference key="NSTarget" ref="67762522"/>
<string key="NSAction">_doScroller:</string>
@ -624,7 +618,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="90778228"/>
<bool key="NSEnabled">YES</bool>
<int key="NSsFlags">1</int>
@ -636,8 +629,7 @@
</object>
<string key="NSFrame">{{0, 40}, {437, 340}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="67614164"/>
<reference key="NSNextKeyView" ref="90778228"/>
<int key="NSsFlags">133266</int>
<reference key="NSVScroller" ref="508855094"/>
<reference key="NSHScroller" ref="67614164"/>
@ -648,7 +640,6 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{373, 10}, {55, 24}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="738226569"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="691588619">
@ -668,14 +659,12 @@
</object>
<string key="NSFrame">{{0, 20}, {437, 380}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="67762522"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrameSize">{437, 400}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="587786245"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
@ -1045,8 +1034,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{355, 14}</string>
<reference key="NSSuperview" ref="502317114"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="220510991"/>
<reference key="NSNextKeyView" ref="711933423"/>
<object class="NSTextContainer" key="NSTextContainer" id="320150212">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@ -1112,7 +1100,6 @@
</object>
<string key="NSFrame">{{1, 1}, {355, 112}}</string>
<reference key="NSSuperview" ref="1005624342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="233393067"/>
<reference key="NSDocView" ref="233393067"/>
<reference key="NSBGColor" ref="923521988"/>
@ -1124,7 +1111,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{341, 1}, {15, 112}}</string>
<reference key="NSSuperview" ref="1005624342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="30601468"/>
<reference key="NSTarget" ref="1005624342"/>
<string key="NSAction">_doScroller:</string>
@ -1135,7 +1121,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="1005624342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="502317114"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1005624342"/>
@ -1146,8 +1131,7 @@
</object>
<string key="NSFrame">{{12, 44}, {357, 114}}</string>
<reference key="NSSuperview" ref="426761021"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="711933423"/>
<reference key="NSNextKeyView" ref="502317114"/>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="220510991"/>
<reference key="NSHScroller" ref="711933423"/>
@ -1158,7 +1142,6 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{336, 14}, {33, 23}}</string>
<reference key="NSSuperview" ref="426761021"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="549344770">
<int key="NSCellFlags">-2080244224</int>
@ -1179,7 +1162,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{12, 13}, {319, 26}}</string>
<reference key="NSSuperview" ref="426761021"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="558960764"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="929426175">
@ -1254,7 +1236,6 @@
</object>
<string key="NSFrameSize">{389, 178}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1005624342"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
@ -2127,140 +2108,7 @@
<nil key="sourceID"/>
<int key="maxID">323</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">ClonkWindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">scroll:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">scroll:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">scroll:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ClonkWindowController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ConsoleWindowController</string>
<string key="superclassName">ClonkWindowController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>consoleIn:</string>
<string>halt:</string>
<string>kickPlayer:</string>
<string>objectIn:</string>
<string>play:</string>
<string>selectIFT:</string>
<string>selectLandscapeMode:</string>
<string>selectMaterial:</string>
<string>selectMode:</string>
<string>selectTexture:</string>
<string>selectTool:</string>
<string>setGrade:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>consoleIn:</string>
<string>halt:</string>
<string>kickPlayer:</string>
<string>objectIn:</string>
<string>play:</string>
<string>selectIFT:</string>
<string>selectLandscapeMode:</string>
<string>selectMaterial:</string>
<string>selectMode:</string>
<string>selectTexture:</string>
<string>selectTool:</string>
<string>setGrade:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">consoleIn:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">halt:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">kickPlayer:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">objectIn:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">play:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectIFT:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectLandscapeMode:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectMaterial:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectMode:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectTexture:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectTool:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">setGrade:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ConsoleWindowController.h</string>
</object>
</object>
</object>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

16
src/res/ConsoleGUIWindow.xib → src/res/EditorGUIWindow.xib
View File

@ -30,7 +30,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
<string key="NSClassName">ClonkWindowController</string>
<string key="NSClassName">C4WindowController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@ -57,7 +57,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{480, 270}</string>
<reference key="NSSuperview" ref="323620923"/>
<string key="NSClassName">ClonkOpenGLView</string>
<string key="NSClassName">C4OpenGLView</string>
</object>
</object>
<string key="NSFrameSize">{480, 270}</string>
@ -190,15 +190,15 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">ClonkOpenGLView</string>
<string key="className">C4OpenGLView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">src/platform/ClonkOpenGLView.h</string>
<string key="minorKey">src/platform/C4OpenGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ClonkWindowController</string>
<string key="className">C4WindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">scroll:</string>
@ -220,7 +220,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ClonkOpenGLView</string>
<string>C4OpenGLView</string>
<string>NSScrollView</string>
</object>
</object>
@ -235,7 +235,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">openGLView</string>
<string key="candidateClassName">ClonkOpenGLView</string>
<string key="candidateClassName">C4OpenGLView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">scrollView</string>
@ -245,7 +245,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">src/platform/ClonkWindowController.h</string>
<string key="minorKey">src/platform/C4WindowController.h</string>
</object>
</object>
</object>

4
src/res/ClonkWindow.xib → src/res/EditorViewport.xib
View File

@ -30,7 +30,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
<string key="NSClassName">ClonkWindowController</string>
<string key="NSClassName">C4WindowController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@ -68,7 +68,7 @@
<string key="NSFrameSize">{480, 270}</string>
<reference key="NSSuperview" ref="1010538885"/>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSClassName">ClonkEditorOpenGLView</string>
<string key="NSClassName">C4EditorOpenGLView</string>
</object>
</object>
<string key="NSFrame">{{1, 1}, {480, 270}}</string>

16
src/res/FullscreenWindow.xib → src/res/FullScreen.xib
View File

@ -30,7 +30,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
<string key="NSClassName">ClonkWindowController</string>
<string key="NSClassName">C4WindowController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@ -152,7 +152,7 @@
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{202, 428}, {480, 270}}</string>
<string>ClonkOpenGLView</string>
<string>C4OpenGLView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
@ -178,15 +178,15 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">ClonkOpenGLView</string>
<string key="className">C4OpenGLView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../src/platform/ClonkOpenGLView.h</string>
<string key="minorKey">../../src/platform/C4OpenGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ClonkWindowController</string>
<string key="className">C4WindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">scroll:</string>
@ -208,7 +208,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ClonkOpenGLView</string>
<string>C4OpenGLView</string>
<string>NSScrollView</string>
</object>
</object>
@ -223,7 +223,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">openGLView</string>
<string key="candidateClassName">ClonkOpenGLView</string>
<string key="candidateClassName">C4OpenGLView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">scrollView</string>
@ -233,7 +233,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../src/platform/ClonkWindowController.h</string>
<string key="minorKey">../../src/platform/C4WindowController.h</string>
</object>
</object>
</object>

16
src/res/MainMenu.xib
View File

@ -995,7 +995,7 @@
<string key="NSClassName">NSFontManager</string>
</object>
<object class="NSCustomObject" id="898186092">
<string key="NSClassName">ClonkAppDelegate</string>
<string key="NSClassName">C4AppDelegate</string>
</object>
<object class="NSUserDefaultsController" id="285433277">
<bool key="NSSharedInstance">YES</bool>
@ -2641,7 +2641,7 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">ClonkAppDelegate</string>
<string key="className">C4AppDelegate</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2842,12 +2842,12 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ClonkAppDelegate.h</string>
<string key="minorKey">./Classes/C4AppDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ClonkEditorOpenGLView</string>
<string key="superclassName">ClonkOpenGLView</string>
<string key="className">C4EditorOpenGLView</string>
<string key="superclassName">C4OpenGLView</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@ -2910,15 +2910,15 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ClonkEditorOpenGLView.h</string>
<string key="minorKey">./Classes/C4EditorOpenGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ClonkOpenGLView</string>
<string key="className">C4OpenGLView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ClonkOpenGLView.h</string>
<string key="minorKey">./Classes/C4OpenGLView.h</string>
</object>
</object>
</object>