notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac OS X updates: Fixed typing in Mac print dialogs. Fixed endian issue so that printing from an Intel-based Mac no longer messes up colors. Added automatic scaling and orientation of image for Mac printing. Added menu items to Mac menu bar - New, Open, Save, Print, Page Setup, Undo, Redo. Use standard Mac arrow cursror rather than custom Tux Paint arrow cursor for more consistent look and feel.

Browse source
This commit is contained in:
Martin Fuhrer 2007-06-12 05:29:25 +00:00
parent 0d7887897b
commit 9a8fc843d3
9 changed files with 388 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

13
macosx/English.lproj/SDLMain.nib/classes.nib generated
View file

@ -2,7 +2,18 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {makeFullscreen = id; quit = id; };
ACTIONS = {
makeFullscreen = id;
onHelp = id;
onNew = id;
onOpen = id;
onPageSetup = id;
onPrint = id;
onQuit = id;
onRedo = id;
onSave = id;
onUndo = id;
};
CLASS = SDLMain;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;

12
macosx/English.lproj/SDLMain.nib/info.nib generated
View file

@ -3,15 +3,19 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>186 88 356 240 0 0 1440 878 </string>
<string>71 160 356 240 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>184 416 205 44 0 0 1440 878 </string>
<string>201 387 286 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>443.0</string>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8F46</string>
<string>8P135</string>
</dict>
</plist>

BIN
macosx/English.lproj/SDLMain.nib/objects.nib generated
View file

Binary file not shown.

16
macosx/SDLMain.h
View file

@ -12,4 +12,20 @@
#import <Cocoa/Cocoa.h>
@interface SDLMain : NSObject
{
}
- (IBAction)onNew:(id)sender;
- (IBAction)onOpen:(id)sender;
- (IBAction)onSave:(id)sender;
- (IBAction)onPrint:(id)sender;
- (IBAction)onPageSetup:(id)sender;
- (IBAction)onUndo:(id)sender;
- (IBAction)onRedo:(id)sender;
- (IBAction)onHelp:(id)sender;
- (IBAction)onQuit:(id)sender;
- (void) sendSDLControlKeystroke:(int)key;
- (void) setupBridge;
@end

196
macosx/SDLMain.m
View file

@ -10,13 +10,22 @@
#import <sys/param.h> /* for MAXPATHLEN */
#import <unistd.h>
#include "wrapperdata.h"
#import "macosx_print.h"
#import "wrapperdata.h"
/* For some reaon, Apple removed setAppleMenu from the headers in 10.4,
but the method still is there and works. To avoid warnings, we declare
it ourselves here. */
@interface NSApplication(SDL_Missing_Methods)
- (void)setAppleMenu:(NSMenu *)menu;
@end
/* Use this flag to determine whether we use SDLMain.nib or not */
#define SDL_USE_NIB_FILE 0
#define SDL_USE_NIB_FILE 1
/* Use this flag to determine whether we use CPS (docking) or not */
#define SDL_USE_CPS 1
#ifdef SDL_USE_CPS
/* Portions of CPS.h */
typedef struct CPSProcessSerNum
@ -34,6 +43,7 @@ extern OSErr CPSSetFrontProcess( CPSProcessSerNum *psn);
static int gArgc;
static char **gArgv;
static BOOL gFinderLaunch;
static BOOL gCalledAppMainline = FALSE;
WrapperData macosx;
@ -64,6 +74,20 @@ static NSString *getApplicationName(void)
@end
@implementation SDLApplication
- (void)sendEvent:(NSEvent *)anEvent
{
if (!macosx.cocoaKeystrokes)
{
if (NSKeyDown == [anEvent type] || NSKeyUp == [anEvent type])
{
if( ( [anEvent modifierFlags] & NSCommandKeyMask ) == 0 )
return; // do not intercept keystrokes intended for SDL layer
}
}
[super sendEvent: anEvent];
}
/* Invoked from the Quit menu item */
- (void)terminate:(id)sender
{
@ -73,15 +97,6 @@ static NSString *getApplicationName(void)
SDL_PushEvent(&event);
}
- (void)sendEvent:(NSEvent *)anEvent {
if( NSKeyDown == [anEvent type] || NSKeyUp ==
[anEvent type] ) {
if( [anEvent modifierFlags] & NSCommandKeyMask )
[super sendEvent: anEvent];
} else
[super sendEvent: anEvent];
}
- (void)tuxpaintHelp:(id)sender
{
NSString* helpPath = [[NSBundle mainBundle] pathForResource:@"README" ofType:@"html" inDirectory:@"html"];
@ -132,6 +147,78 @@ static NSString *getApplicationName(void)
/* The main class of the application, the application's delegate */
@implementation SDLMain
- (IBAction) onNew:(id)sender
{
[self sendSDLControlKeystroke:SDLK_n];
/*
[NSApp beginSheet:nameWindow
modalForWindow:[NSApp mainWindow]
modalDelegate:nil
didEndSelector:nil
contextInfo:nil];
[NSApp runModalForWindow:nameWindow];
[NSApp endSheet:nameWindow];
[nameWindow orderOut:self];
*/
}
- (IBAction) onOpen:(id)sender
{
[self sendSDLControlKeystroke:SDLK_o];
}
- (IBAction) onSave:(id)sender
{
[self sendSDLControlKeystroke:SDLK_s];
}
- (IBAction) onPrint:(id)sender
{
macosx.menuAction = 1;
do_print();
macosx.menuAction = 0;
}
- (IBAction) onPageSetup:(id)sender
{
DisplayPageSetup();
}
- (IBAction) onUndo:(id)sender
{
[self sendSDLControlKeystroke:SDLK_z];
}
- (IBAction) onRedo:(id)sender
{
[self sendSDLControlKeystroke:SDLK_r];
}
- (IBAction)onHelp:(id)sender
{
NSString* helpPath = [[NSBundle mainBundle] pathForResource:@"README" ofType:@"html" inDirectory:@"html"];
[[NSWorkspace sharedWorkspace] openFile:helpPath];
}
- (IBAction) onQuit:(id)sender
{
/* Post a SDL_QUIT event */
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
- (void) sendSDLControlKeystroke:(int)key
{
SDL_Event event;
event.type = SDL_KEYDOWN;
event.key.keysym.sym = key;
event.key.keysym.mod = KMOD_CTRL;
SDL_PushEvent(&event);
}
/* Set the working directory to the .app's parent directory */
- (void) setupWorkingDirectory:(BOOL)shouldChdir
{
@ -140,13 +227,12 @@ static NSString *getApplicationName(void)
char parentdir[MAXPATHLEN];
CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
if (CFURLGetFileSystemRepresentation(url2, true, parentdir, MAXPATHLEN)) {
if (CFURLGetFileSystemRepresentation(url2, true, (UInt8 *)parentdir, MAXPATHLEN)) {
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
}
CFRelease(url);
CFRelease(url2);
}
}
#if SDL_USE_NIB_FILE
@ -207,7 +293,6 @@ static void setApplicationMenu(void)
title = [@"Quit " stringByAppendingString:appName];
[appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
/* Put menu into the menubar */
menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
[menuItem setSubmenu:appleMenu];
@ -279,7 +364,6 @@ static void CustomApplicationMain (argc, argv)
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
SDLMain *sdlMain;
CocoaToSDLBridge *bridge;
/* Ensure the application object is initialised */
[SDLApplication sharedApplication];
@ -301,11 +385,6 @@ static void CustomApplicationMain (argc, argv)
setupWindowMenu();
setupHelpMenu();
/* Pass information to SDL application */
bridge = [[CocoaToSDLBridge alloc] init];
[bridge autorelease];
[bridge fontsPath];
/* Create SDLMain and make it the app delegate */
sdlMain = [[SDLMain alloc] init];
[NSApp setDelegate:sdlMain];
@ -319,12 +398,75 @@ static void CustomApplicationMain (argc, argv)
#endif
/* Make Mac-specific information available to SDL app */
- (void) setupBridge
{
CocoaToSDLBridge *bridge;
bridge = [[CocoaToSDLBridge alloc] init];
[bridge autorelease];
[bridge fontsPath];
[bridge preferencesPath];
}
/*
* Catch document open requests...this lets us notice files when the app
* was launched by double-clicking a document, or when a document was
* dragged/dropped on the app's icon. You need to have a
* CFBundleDocumentsType section in your Info.plist to get this message,
* apparently.
*
* Files are added to gArgv, so to the app, they'll look like command line
* arguments. Previously, apps launched from the finder had nothing but
* an argv[0].
*
* This message may be received multiple times to open several docs on launch.
*
* This message is ignored once the app's mainline has been called.
*/
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
const char *temparg;
size_t arglen;
char *arg;
char **newargv;
if (!gFinderLaunch) /* MacOS is passing command line args. */
return FALSE;
if (gCalledAppMainline) /* app has started, ignore this document. */
return FALSE;
temparg = [filename UTF8String];
arglen = SDL_strlen(temparg) + 1;
arg = (char *) SDL_malloc(arglen);
if (arg == NULL)
return FALSE;
newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
if (newargv == NULL)
{
SDL_free(arg);
return FALSE;
}
gArgv = newargv;
SDL_strlcpy(arg, temparg, arglen);
gArgv[gArgc++] = arg;
gArgv[gArgc] = NULL;
return TRUE;
}
/* Called when the internal event loop has just started running */
- (void) applicationDidFinishLaunching: (NSNotification *) note
{
setenv ("SDL_ENABLEAPPEVENTS", "1", 1);
int status;
/* Allow Cocoa events to be processed */
setenv ("SDL_ENABLEAPPEVENTS", "1", 1);
/* Set up Cocoa to SDL bridge */
[self setupBridge];
/* Set the working directory to the .app's parent directory */
[self setupWorkingDirectory:gFinderLaunch];
@ -334,6 +476,7 @@ static void CustomApplicationMain (argc, argv)
#endif
/* Hand off to main application code */
gCalledAppMainline = TRUE;
status = SDL_main (gArgc, gArgv);
/* We're done, thank you for playing */
@ -392,20 +535,25 @@ static void CustomApplicationMain (argc, argv)
int main (int argc, char **argv)
{
/* Copy the arguments into a global variable */
gArgv = argv;
/* This is passed if we are launched by double-clicking */
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
gArgv[0] = argv[0];
gArgv[1] = NULL;
gArgc = 1;
gFinderLaunch = YES;
} else {
int i;
gArgc = argc;
gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
for (i = 0; i <= argc; i++)
gArgv[i] = argv[i];
gFinderLaunch = NO;
}
#if SDL_USE_NIB_FILE
[SDLApplication poseAsClass:[NSApplication class]];
NSApplicationMain (argc, argv);
NSApplicationMain (argc, (const char**) argv);
#else
CustomApplicationMain (argc, argv);
#endif

4
macosx/wrapperdata.h
View file

@ -1,6 +1,6 @@
/*
* wrapperdata.h
* TuxPaint
* Tux Paint
*
* Created by Martin Fuhrer on Wed May 12 2004.
* Copyright (c) 2004 __MyCompanyName__. All rights reserved.
@ -20,6 +20,8 @@ struct WrapperDataStruct
int foundSDL; // was SDL.framework found?
int foundSDL_image; // was SDL_image.framework found?
int foundSDL_mixer; // was SDL_mixer.framework found?
int cocoaKeystrokes; // should keystrokes be intercepted by Cocoa wrapper?
int menuAction; // was the action initiated by a Mac OS X menu selection?
};
typedef struct WrapperDataStruct WrapperData;

15
src/macosx_print.h
View file

@ -25,3 +25,18 @@
#include "SDL.h"
const char *SurfacePrint(SDL_Surface * surface, int showDialog);
#ifdef OBJECTIVEC
BOOL DisplayPageSetup();
@interface PrintSheetController : NSObject
{
bool displayPrintSetupSheet;
bool displayPrintSheet;
}
-
@end
#endif OBJECTIVEC

164
src/macosx_print.m
View file

@ -24,8 +24,11 @@
//
#import "macosx_print.h"
#import "wrapperdata.h"
#import <Cocoa/Cocoa.h>
extern WrapperData macosx;
// this object presents the image to the printing layer
@interface ImageView : NSView
{
@ -43,8 +46,14 @@
- (void) drawRect:(NSRect)rect
{
[ _image compositeToPoint: NSMakePoint (0, 0) operation: NSCompositeCopy ];
[ _image compositeToPoint: NSMakePoint( 0, 0 ) operation: NSCompositeCopy ];
}
- (BOOL) scalesWhenResized
{
return YES;
}
@end
// this object waits for the print dialog to go away
@ -112,23 +121,27 @@
@end
static NSImage* CreateImage (SDL_Surface *surface)
static NSImage* CreateImage( SDL_Surface *surface )
{
NSBitmapImageRep* imageRep;
NSSize imageSize;
NSImage* image;
SDL_Surface* surface32RGBA;
// convert surface to 32bit RGBA
surface32RGBA = SDL_CreateRGBSurface (SDL_SWSURFACE, surface->w, surface->h,
32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0);
if (surface32RGBA == NULL) {
#ifdef BIG_ENDIAN_ARCH
surface32RGBA = SDL_CreateRGBSurface( SDL_SWSURFACE, surface->w, surface->h,
32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0 );
#else
surface32RGBA = SDL_CreateRGBSurface( SDL_SWSURFACE, surface->w, surface->h,
32, 0xff<<0, 0xff<<8, 0xff<<16, 0xff<<24 );
#endif
if( surface32RGBA == NULL ) {
NSLog (@"CreateImage: Cannot allocate conversion surface");
return nil;
}
SDL_BlitSurface (surface, NULL, surface32RGBA, NULL);
SDL_BlitSurface( surface, NULL, surface32RGBA, NULL );
// convert surface to an NSBitmapImageRep
imageRep = [ [ NSBitmapImageRep alloc]
@ -142,71 +155,40 @@ static NSImage* CreateImage (SDL_Surface *surface)
colorSpaceName:NSDeviceRGBColorSpace
bytesPerRow:surface->w * 4
bitsPerPixel:32 ];
if (imageRep == nil) {
if( imageRep == nil ) {
NSLog (@"CreateImage: Could not create image representation.");
return nil;
}
imageSize = NSMakeSize (surface->w, surface->h);
imageSize = NSMakeSize( surface->w, surface->h );
image = [ [ NSImage alloc ] initWithSize:imageSize ];
if (image == nil) {
if( image == nil ) {
NSLog (@"CreateImage: Could not allocate image");
return nil;
}
[ image addRepresentation:imageRep ];
[ image setScalesWhenResized:YES ];
[ image setDataRetained:YES ];
[ image autorelease ];
[ imageRep release ];
free (surface32RGBA);
free( surface32RGBA );
return image;
}
const char* SurfacePrint (SDL_Surface *surface, int showDialog)
BOOL DisplayPageSetup()
{
NSImage* image;
ImageView* printView;
NSWindow* printWindow;
NSPrintOperation* printOperation;
NSPageLayout* pageLayout;
NSPrintInfo* printInfo;
ModalDelegate* delegate;
BOOL ok = YES;
const char* error = NULL;
BOOL result;
// create image for surface
image = CreateImage (surface);
if (image == nil)
return "Could not create image";
// create print view
printView = [ [ ImageView alloc ] initWithFrame: NSMakeRect (0, 0, surface->w, surface->h) ];
if (printView == nil)
return "Could not create print view";
[ printView setImage:image ];
// attach view to offscreen window
printWindow = [ [ NSWindow alloc ]
initWithContentRect: NSMakeRect (0, 0, surface->w, surface->h)
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered
defer:NO ];
if (printWindow == nil)
return "Could not create offscreen window";
[ printWindow setContentView:printView ];
// create print control objects
macosx.cocoaKeystrokes = 1;
printInfo = [ NSPrintInfo sharedPrintInfo ];
delegate = [ [ ModalDelegate alloc ] init ];
// run page layout dialog
if (showDialog) {
NSPageLayout* pageLayout;
delegate = [ [ [ ModalDelegate alloc ] init ] autorelease ];
pageLayout = [ NSPageLayout pageLayout ];
[ pageLayout beginSheetWithPrintInfo:printInfo
modalForWindow:[ NSApp mainWindow ]
@ -214,19 +196,87 @@ const char* SurfacePrint (SDL_Surface *surface, int showDialog)
didEndSelector:@selector(pageLayoutEnded:returnCode:contextInfo:)
contextInfo:nil ];
ok = [ delegate wait ];
[ delegate reset ];
result = [ delegate wait ];
macosx.cocoaKeystrokes = 0;
return result;
}
void DefaultPrintSettings( SDL_Surface *surface )
{
NSPrintInfo* printInfo = [ NSPrintInfo sharedPrintInfo ];
if( surface->w > surface->h )
[ printInfo setOrientation:NSLandscapeOrientation ];
else
[ printInfo setOrientation:NSPortraitOrientation ];
[ printInfo setHorizontallyCentered:true ];
[ printInfo setVerticallyCentered:true ];
[ printInfo setVerticalPagination:NSFitPagination ];
[ printInfo setHorizontalPagination:NSFitPagination ];
}
const char* SurfacePrint( SDL_Surface *surface, int showDialog )
{
NSImage* image;
ImageView* printView;
NSWindow* printWindow;
NSPrintOperation* printOperation;
NSPrintInfo* printInfo;
ModalDelegate* delegate;
static BOOL firstTime = YES;
BOOL ok = YES;
const char* error = NULL;
// create image for surface
image = CreateImage( surface );
if( image == nil )
return "Could not create image";
if( firstTime == YES ) {
DefaultPrintSettings( surface );
firstTime = NO;
}
if (!ok) {
error = "Canceled printing at page layout";
goto bail;
// create print control objects
printInfo = [ NSPrintInfo sharedPrintInfo ];
NSRect pageRect = [ printInfo imageablePageBounds ];
NSSize pageSize = pageRect.size;
NSPoint pageOrigin = pageRect.origin;
[ printInfo setTopMargin:pageOrigin.y ];
[ printInfo setLeftMargin:pageOrigin.x ];
[ printInfo setRightMargin:pageOrigin.x ];
[ printInfo setBottomMargin:pageOrigin.y ];
float surfaceRatio = surface->w / surface->h;
float pageRatio = pageSize.width / pageSize.height;
NSSize imageSize = pageSize;
if( pageRatio > surfaceRatio ) // wide page
{
imageSize.width = surface->w * pageSize.height / surface->h;
}
else // tall page
{
imageSize.height = surface->h * pageSize.width / surface->w;
}
// create print view
printView = [ [ [ ImageView alloc ] initWithFrame: NSMakeRect( 0, 0, imageSize.width, imageSize.height ) ] autorelease ];
if (printView == nil)
return "Could not create print view";
[ image setSize:imageSize ];
[ printView setImage:image ];
// run printing
printOperation = [ NSPrintOperation printOperationWithView:printView printInfo:printInfo ];
[ printOperation setShowPanels:showDialog ];
macosx.cocoaKeystrokes = 1;
delegate = [ [ [ ModalDelegate alloc ] init ] autorelease ];
[ printOperation runOperationModalForWindow:[ NSApp mainWindow ]
delegate:delegate didRunSelector:@selector(printDidRun:success:contextInfo:) contextInfo:nil ];
@ -234,12 +284,8 @@ const char* SurfacePrint (SDL_Surface *surface, int showDialog)
if (!ok)
error = "Canceled or error when printing";
bail:
// cleanup
[ delegate release ];
macosx.cocoaKeystrokes = 0;
[ image release ];
[ printView release ];
[ printWindow release ];
return error;
}

27
src/tuxpaint.c
View file

@ -224,7 +224,7 @@ char *strcasestr(const char *haystack, const char *needle)
#endif
/* kluge; 2006.01.15 */
/* kludge; 2006.01.15 */
//#define __APPLE_10_2_8__
/* (Trouble building this for 10.2.8 target; bjk & mf 2006.01.14) */
@ -288,6 +288,8 @@ typedef struct safer_dirent
#endif
#ifdef __APPLE__
#include "macosx_print.h"
#include "wrapperdata.h"
extern WrapperData macosx;
#endif
#else
@ -1244,7 +1246,7 @@ static void hsvtorgb(float h, float s, float v, Uint8 * r8, Uint8 * g8,
SDL_Surface *flip_surface(SDL_Surface * s);
SDL_Surface *mirror_surface(SDL_Surface * s);
static void do_print(void);
void do_print(void);
static void strip_trailing_whitespace(char *buf);
static void do_render_cur_text(int do_blit);
static char *uppercase(char *str);
@ -7235,6 +7237,10 @@ static void setup(int argc, char *argv[])
scale = 2;
#endif
#ifdef __APPLE__
cursor_arrow = SDL_GetCursor(); // use standard system cursor
#endif
// this one first, because we need it yesterday
cursor_watch = get_cursor(watch_bits, watch_mask_bits,
watch_width, watch_height,
@ -7251,6 +7257,12 @@ static void setup(int argc, char *argv[])
// continuing on with the rest of the cursors...
#ifndef __APPLE__
cursor_arrow = get_cursor(arrow_bits, arrow_mask_bits,
arrow_width, arrow_height, 0, 0);
#endif
cursor_hand = get_cursor(hand_bits, hand_mask_bits,
hand_width, hand_height, 12 / scale, 1 / scale);
@ -7272,9 +7284,6 @@ static void setup(int argc, char *argv[])
rotate_width, rotate_height,
15 / scale, 15 / scale);
cursor_arrow = get_cursor(arrow_bits, arrow_mask_bits,
arrow_width, arrow_height, 0, 0);
cursor_up = get_cursor(up_bits, up_mask_bits,
up_width, up_height, 15 / scale, 1 / scale);
@ -15079,7 +15088,7 @@ static void hsvtorgb(float h, float s, float v, Uint8 * r8, Uint8 * g8,
}
static void do_print(void)
void do_print(void)
{
#if !defined(WIN32) && !defined(__BEOS__) && !defined(__APPLE__)
char *pcmd;
@ -15134,15 +15143,15 @@ static void do_print(void)
SurfacePrint(canvas);
#elif defined(__APPLE__)
/* Mac OS X */
int show = (want_alt_printcommand && !fullscreen);
int show = ( ( want_alt_printcommand || macosx.menuAction ) && !fullscreen);
const char *error = SurfacePrint(canvas, show);
/*
if (error)
fprintf(stderr, "Cannot print: %s\n", error);
else
do_prompt_snd(PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "", SND_TUXOK);
*/
#endif
#endif