zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 17:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed application delegate to controller

Browse source
This commit is contained in:
alexey.lysiuk 2014-09-13 11:23:38 +03:00
parent b6f829979a
commit 7286ee9626
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/cocoa/i_backend_cocoa.mm
View file

@ -839,7 +839,7 @@ const Uint16 BYTES_PER_PIXEL = 4;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@interface ApplicationDelegate : NSResponder @interface ApplicationController : NSResponder
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<NSFileManagerDelegate> <NSFileManagerDelegate>
#endif #endif
@ -893,10 +893,10 @@ const Uint16 BYTES_PER_PIXEL = 4;
@end @end
static ApplicationDelegate* s_applicationDelegate; static ApplicationController* appCtrl;
@implementation ApplicationDelegate @implementation ApplicationController
- (id)init - (id)init
{ {
@ -1329,7 +1329,7 @@ CUSTOM_CVAR(Bool, vid_hidpi, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{ {
if (IsHiDPISupported()) if (IsHiDPISupported())
{ {
[s_applicationDelegate useHiDPI:self]; [appCtrl useHiDPI:self];
} }
else if (0 != self) else if (0 != self)
{ {
@ -1343,7 +1343,7 @@ CUSTOM_CVAR(Bool, vid_hidpi, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
void I_SetMainWindowVisible(bool visible) void I_SetMainWindowVisible(bool visible)
{ {
[s_applicationDelegate setMainWindowVisible:visible]; [appCtrl setMainWindowVisible:visible];
SetNativeMouse(!visible); SetNativeMouse(!visible);
} }
@ -1405,7 +1405,7 @@ bool I_SetCursor(FTexture* cursorpic)
hotSpot:NSMakePoint(0.0f, 0.0f)]; hotSpot:NSMakePoint(0.0f, 0.0f)];
} }
[s_applicationDelegate invalidateCursorRects]; [appCtrl invalidateCursorRects];
return true; return true;
} }
@ -1492,13 +1492,13 @@ int SDL_Init(Uint32 flags)
void SDL_Quit() void SDL_Quit()
{ {
if (NULL != s_applicationDelegate) if (NULL != appCtrl)
{ {
[NSApp setDelegate:nil]; [NSApp setDelegate:nil];
[NSApp deactivate]; [NSApp deactivate];
[s_applicationDelegate release]; [appCtrl release];
s_applicationDelegate = NULL; appCtrl = NULL;
} }
} }
@ -1615,17 +1615,17 @@ static SDL_PixelFormat* GetPixelFormat()
SDL_Surface* SDL_SetVideoMode(int width, int height, int, Uint32 flags) SDL_Surface* SDL_SetVideoMode(int width, int height, int, Uint32 flags)
{ {
[s_applicationDelegate changeVideoResolution:(SDL_FULLSCREEN & flags) [appCtrl changeVideoResolution:(SDL_FULLSCREEN & flags)
width:width width:width
height:height height:height
useHiDPI:vid_hidpi]; useHiDPI:vid_hidpi];
static SDL_Surface result; static SDL_Surface result;
if (!(SDL_OPENGL & flags)) if (!(SDL_OPENGL & flags))
{ {
[s_applicationDelegate setupSoftwareRenderingWithWidth:width [appCtrl setupSoftwareRenderingWithWidth:width
height:height]; height:height];
} }
result.flags = flags; result.flags = flags;
@ -1633,7 +1633,7 @@ SDL_Surface* SDL_SetVideoMode(int width, int height, int, Uint32 flags)
result.w = width; result.w = width;
result.h = height; result.h = height;
result.pitch = width * BYTES_PER_PIXEL; result.pitch = width * BYTES_PER_PIXEL;
result.pixels = [s_applicationDelegate softwareRenderingBuffer]; result.pixels = [appCtrl softwareRenderingBuffer];
result.refcount = 1; result.refcount = 1;
result.clip_rect.x = 0; result.clip_rect.x = 0;
@ -1664,10 +1664,10 @@ int SDL_WM_ToggleFullScreen(SDL_Surface* surface)
surface->flags |= SDL_FULLSCREEN; surface->flags |= SDL_FULLSCREEN;
} }
[s_applicationDelegate changeVideoResolution:(SDL_FULLSCREEN & surface->flags) [appCtrl changeVideoResolution:(SDL_FULLSCREEN & surface->flags)
width:surface->w width:surface->w
height:surface->h height:surface->h
useHiDPI:vid_hidpi]; useHiDPI:vid_hidpi];
return 1; return 1;
} }
@ -1682,7 +1682,7 @@ int SDL_GL_SetAttribute(SDL_GLattr attr, int value)
{ {
if (SDL_GL_MULTISAMPLESAMPLES == attr) if (SDL_GL_MULTISAMPLESAMPLES == attr)
{ {
[s_applicationDelegate setMultisample:value]; [appCtrl setMultisample:value];
} }
// Not interested in other attributes // Not interested in other attributes
@ -1832,8 +1832,8 @@ int main(int argc, char** argv)
[NSApplication sharedApplication]; [NSApplication sharedApplication];
[NSBundle loadNibNamed:@"zdoom" owner:NSApp]; [NSBundle loadNibNamed:@"zdoom" owner:NSApp];
s_applicationDelegate = [ApplicationDelegate new]; appCtrl = [ApplicationController new];
[NSApp setDelegate:s_applicationDelegate]; [NSApp setDelegate:appCtrl];
[NSApp run]; [NSApp run];