view src/video/Xext/Xv/Xvlibint.h @ 1211:304d8dd6a989

To: sdl@libsdl.org From: Christian Walther <cwalther@gmx.ch> Date: Wed, 28 Dec 2005 12:13:20 +0100 Subject: [SDL] Fix for opening documents on Mac OS X < 10.4 The current code in SDLMain.m that transforms documents opened from the Finder into command-line arguments (introduced in revision 1.14, 2005-08-11) uses the methods -[NSString lengthOfBytesUsingEncoding:] and -[NSString getCString:maxLength:encoding:], which are only available in Mac OS X 10.4. Compiling this code on 10.3 produces warnings, and running it (i.e. starting an SDL application by opening a document) leads to weird behavior which I didn't investigate in detail ("*** -[NSCFString lengthOfBytesUsingEncoding:]: selector not recognized" is printed to the console log, and the SDL window never opens). The attached patch removes the offending calls and uses -[NSString UTF8String] instead, which is available everywhere. Tested on 10.3.9, and I see no reason why it shouldn't also work on 10.2 and 10.4. Two further comments: * The comment above the -[SDLMain application: openFile:] implementation says "You need to have a CFBundleDocumentsType section in your Info.plist to get this message, apparently." This is not the case in my experience - it worked just fine with a hand-built bare-bones application consisting only of Test.app/Contents/MacOS/test, without any Info.plist (although you have to press the option and command keys for such an application to accept a dragged file). * I took the liberty of cleaning up another area of SDLMain.m: I changed "CustomApplicationMain (argc, argv)" to "CustomApplicationMain (int argc, char **argv)". This avoids the "type of `argv' defaults to `int'" warnings, and I'm not sure if leaving out the types could cause problems on platforms where an int and a char** aren't of the same size. -Christian
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 01 Jan 2006 23:45:52 +0000
parents 045f186426e1
children 19418e4422cb
line wrap: on
line source

/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, 
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in 
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.  

DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.

******************************************************************/
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */

#ifndef XVLIBINT_H
#define XVLIBINT_H
/*
** File: 
**
**   Xvlibint.h --- Xv library internal header file
**
** Author: 
**
**   David Carver (Digital Workstation Engineering/Project Athena)
**
** Revisions:
**
**   01.24.91 Carver
**     - version 1.4 upgrade
**
*/

#define NEED_REPLIES

#include <X11/Xlibint.h>
#include "Xvproto.h"
#include "Xvlib.h"

#if !defined(UNIXCPP)
#define XvGetReq(name, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv##name##Req)) > dpy->bufmax)\
		p_XFlush(dpy);\
	req = (xv##name##Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = info->codes->major_opcode;\
        req->xvReqType = xv_##name; \
        req->length = (SIZEOF(xv##name##Req))>>2;\
	dpy->bufptr += SIZEOF(xv##name##Req);\
	dpy->request++

#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
#define XvGetReq(name, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req)) > dpy->bufmax)\
		p_XFlush(dpy);\
	req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = info->codes->major_opcode;\
	req->xvReqType = xv_/**/name;\
	req->length = (SIZEOF(xv/**/name/**/Req))>>2;\
	dpy->bufptr += SIZEOF(xv/**/name/**/Req);\
	dpy->request++
#endif


#endif /* XVLIBINT_H */