Mercurial > sdl-ios-xcode
view src/video/bwindow/SDL_BWin.h @ 4324:1496aa09e41e SDL-1.2
Steven Noonan to sdl
While trying to build the SDLMain.m included with SDL 1.2.14, with
#define SDL_USE_NIB_FILE 1:
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
In function '-[SDLMain fixMenu:withAppName:]':
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:122:
warning: 'sizeToFit' is deprecated (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSMenu.h:281)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
In function 'main':
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
warning: 'poseAsClass:' is deprecated (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
error: 'poseAsClass:' is unavailable (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:377:
warning: passing argument 2 of 'NSApplicationMain' from incompatible
pointer type
Eric Wing to Sam
I don't have time today to look at this in detail, but the problem is definitely the poseAsClass: method.
This was deprecated in Obj-C 2.0 and not retained in 64-bit.
I've never used this method and it has always been limited to esoteric uses. I think this is why Apple wanted to dump it (among complicating some other things they do). I have read about others getting bit by this when migrating. Long story short, there really isn't a migration path for this method. The question that then must be asked is why are we using it (what does it accomplish), and then figure out the 'proper' way of accomplishing that.
Glancing at SDLMain.m, it's not obvious to me why it is there or what it is really accomplishing. My only speculation is that NSApplicationMain hardcodes something to look for NSApplication and a subclass (SDLApplication) fails for some reason (assuming that the original coder did this for good reason).
Three thoughts come to mind.
1) The Info.plist has properties to control things related to the startup class and nib.
NSPrincipalClass, NSMainNibFile
Maybe principle class needs to be SDLApplication and we can delete the poseAs
2) I was told that 10.6 introduced new APIs to make programatic NIB wrangling and avoidance easier. Unfortunately, I don't know the specifics.
3) Instead of subclassing NSApplication in SDLMain.m, maybe we can just add a category. It looks like the following is the only thing that is done (quick glance):
@interface SDLApplication : NSApplication
@end
@implementation SDLApplication
/* Invoked from the Quit menu item */
- (void)terminate:(id)sender
{
/* Post a SDL_QUIT event */
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
@end
So instead, we change this to: (warning written in mail and untested)
@interface NSApplication (SDLApplication)
- (void) terminate:(id)sender;
@end
@implementation NSApplication (SDLApplication)
/* Invoked from the Quit menu item */
- (void)terminate:(id)sender
{
/* Post a SDL_QUIT event */
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
@end
Then everywhere SDLApplication is used, we change it to NSApplication (and remove the poseAsClass line).
Perhaps you could ask the bug reporter to try this solution (#3).
And if that fails, maybe try #1.
-Eric
Steven Noonan to Sam
The suggested change (diff below) seems to work fine.
- Steven
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 12 Oct 2009 21:07:12 +0000 |
parents | 0620847bf1a8 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #ifndef _SDL_BWin_h #define _SDL_BWin_h #include "SDL_config.h" #include <stdio.h> #include <AppKit.h> #include <InterfaceKit.h> #include <be/game/DirectWindow.h> #if SDL_VIDEO_OPENGL #include <be/opengl/GLView.h> #endif #include <support/UTF8.h> #include "../../main/beos/SDL_BeApp.h" #include "SDL_events.h" #include "SDL_BView.h" extern "C" { #include "../../events/SDL_events_c.h" extern int mouse_relative; }; class SDL_BWin : public BDirectWindow { public: SDL_BWin(BRect bounds) : BDirectWindow(bounds, "Untitled", B_TITLED_WINDOW, 0) { last_buttons = 0; the_view = NULL; #if SDL_VIDEO_OPENGL SDL_GLView = NULL; #endif SDL_View = NULL; Unlock(); shown = false; inhibit_resize = false; } virtual ~SDL_BWin() { Lock(); if ( the_view ) { #if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { SDL_GLView->UnlockGL(); } #endif RemoveChild(the_view); the_view = NULL; } Unlock(); #if SDL_VIDEO_OPENGL if ( SDL_GLView ) { delete SDL_GLView; } #endif if ( SDL_View ) { delete SDL_View; } } /* Override the Show() method so we can tell when we've been shown */ virtual void Show(void) { BWindow::Show(); shown = true; } virtual bool Shown(void) { return (shown); } /* If called, the next resize event will not be forwarded to SDL. */ virtual void InhibitResize(void) { inhibit_resize=true; } /* Handle resizing of the window */ virtual void FrameResized(float width, float height) { if(inhibit_resize) inhibit_resize = false; else SDL_PrivateResize((int)width, (int)height); } virtual int CreateView(Uint32 flags, Uint32 gl_flags) { int retval; retval = 0; Lock(); if ( flags & SDL_OPENGL ) { #if SDL_VIDEO_OPENGL if ( SDL_GLView == NULL ) { SDL_GLView = new BGLView(Bounds(), "SDL GLView", B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS), gl_flags); SDL_GLView->EnableDirectMode(true); } if ( the_view != SDL_GLView ) { if ( the_view ) { RemoveChild(the_view); } AddChild(SDL_GLView); SDL_GLView->LockGL(); the_view = SDL_GLView; } #else SDL_SetError("OpenGL support not enabled"); retval = -1; #endif } else { if ( SDL_View == NULL ) { SDL_View = new SDL_BView(Bounds()); } if ( the_view != SDL_View ) { if ( the_view ) { #if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { SDL_GLView->UnlockGL(); } #endif RemoveChild(the_view); } AddChild(SDL_View); the_view = SDL_View; } } Unlock(); return(retval); } virtual void SetBitmap(BBitmap *bitmap) { SDL_View->SetBitmap(bitmap); } virtual void SetXYOffset(int x, int y) { #if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { return; } #endif SDL_View->SetXYOffset(x, y); } virtual void GetXYOffset(int &x, int &y) { #if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { x = 0; y = 0; return; } #endif SDL_View->GetXYOffset(x, y); } virtual void GetXYOffset(float &x, float &y) { #if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { x = 0.0f; y = 0.0f; return; } #endif SDL_View->GetXYOffset(x, y); } virtual bool BeginDraw(void) { return(Lock()); } virtual void DrawAsync(BRect updateRect) { SDL_View->DrawAsync(updateRect); } virtual void EndDraw(void) { SDL_View->Sync(); Unlock(); } #if SDL_VIDEO_OPENGL virtual void SwapBuffers(void) { SDL_GLView->UnlockGL(); SDL_GLView->LockGL(); SDL_GLView->SwapBuffers(); } #endif virtual BView *View(void) { return(the_view); } /* Hook functions -- overridden */ virtual void Minimize(bool minimize) { /* This is only called when mimimized, not when restored */ //SDL_PrivateAppActive(minimize, SDL_APPACTIVE); BWindow::Minimize(minimize); } virtual void WindowActivated(bool active) { SDL_PrivateAppActive(active, SDL_APPINPUTFOCUS); } virtual bool QuitRequested(void) { if ( SDL_BeAppActive > 0 ) { SDL_PrivateQuit(); /* We don't ever actually close the window here because the application should respond to the quit request, or ignore it as desired. */ return(false); } return(true); /* Close the app window */ } virtual void Quit() { if (!IsLocked()) Lock(); BDirectWindow::Quit(); } virtual int16 Translate2Unicode(const char *buf) { int32 state, srclen, dstlen; unsigned char destbuf[2]; Uint16 unicode = 0; if ((uchar)buf[0] > 127) { state = 0; srclen = SDL_strlen(buf); dstlen = sizeof(destbuf); convert_from_utf8(B_UNICODE_CONVERSION, buf, &srclen, (char *)destbuf, &dstlen, &state); unicode = destbuf[0]; unicode <<= 8; unicode |= destbuf[1]; } else unicode = buf[0]; /* For some reason function keys map to control characters */ # define CTRL(X) ((X)-'@') switch (unicode) { case CTRL('A'): case CTRL('B'): case CTRL('C'): case CTRL('D'): case CTRL('E'): case CTRL('K'): case CTRL('L'): case CTRL('P'): if ( ! (SDL_GetModState() & KMOD_CTRL) ) unicode = 0; break; /* Keyboard input maps newline to carriage return */ case '\n': unicode = '\r'; break; default: break; } return unicode; } virtual void DispatchMessage(BMessage *msg, BHandler *target); virtual void DirectConnected(direct_buffer_info *info); private: #if SDL_VIDEO_OPENGL BGLView *SDL_GLView; #endif SDL_BView *SDL_View; BView *the_view; bool shown; bool inhibit_resize; int32 last_buttons; }; #endif /* _SDL_BWin_h */