git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@515
7f0cb862-5218-0410-a997-
914c9d46530a
{
if( !callback )
fgError( "Fatal error in program. NULL display callback not "
{
if( !callback )
fgError( "Fatal error in program. NULL display callback not "
- "permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
+ "permitted in GLUT 3.0+ or freeglut 2.0.1+" );
SET_CALLBACK( Display );
}
SET_CALLBACK( Display );
}
{
if( ! (timer = malloc(sizeof(SFG_Timer))) )
fgError( "Fatal error: "
{
if( ! (timer = malloc(sizeof(SFG_Timer))) )
fgError( "Fatal error: "
- "Memory allocation failure in glutTimerFunc()\n" );
+ "Memory allocation failure in glutTimerFunc()" );
}
timer->Callback = callback;
}
timer->Callback = callback;
- fgWarning( "Unknown cursor type: %d\n", cursorID );
+ fgWarning( "Unknown cursor type: %d", cursorID );
);
if( !fgDisplay.DisplayModeValid )
);
if( !fgDisplay.DisplayModeValid )
- fgWarning( "Runtime use of XF86VidModeGetModeLine failed.\n" );
+ fgWarning( "Runtime use of XF86VidModeGetModeLine failed." );
return !!fgStructure.GameMode;
}
return !!fgStructure.GameMode;
}
+ fgWarning( "Unknown gamemode get: %d", eWhat );
break ;
case 28 : /* Unrecognized */
break ;
case 28 : /* Unrecognized */
- printf ( "WARNING - Display string token not recognized: %s\n",
- token );
+ fgWarning ( "WARNING - Display string token not recognized: %s",
+ token );
void fgAddToWindowDestroyList ( SFG_Window* window );
void fgCloseWindows ();
void fgDestroyWindow( SFG_Window* window );
void fgAddToWindowDestroyList ( SFG_Window* window );
void fgCloseWindows ();
void fgDestroyWindow( SFG_Window* window );
-void fgClearCallBacks( SFG_Window *window );
/* Menu creation and destruction. Defined in freeglut_structure.c */
SFG_Menu* fgCreateMenu( FGCBMenu menuCallback );
/* Menu creation and destruction. Defined in freeglut_structure.c */
SFG_Menu* fgCreateMenu( FGCBMenu menuCallback );
return 1;
} else if (errno == EACCES) {
if (!protection_warned) {
return 1;
} else if (errno == EACCES) {
if (!protection_warned) {
- fprintf(stderr, "Can't open %s for read!\n",
- buf);
+ fgWarning ( "Can't open %s for read!", buf );
protection_warned = 1;
}
}
protection_warned = 1;
}
}
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
{
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
{
- fprintf( stderr, "error: %s: %s", os->fname, strerror( errno ) );
+ fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
{
/*** XXX {report_id} may not be the right variable? ***/
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
{
/*** XXX {report_id} may not be the right variable? ***/
- fprintf( stderr, "error: %s%d: %s",
- UHIDDEV, report_id, strerror( errno ) );
+ fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
- fgWarning ( "%s", "PLIB_JS: Unrecognised /dev/js return!?!" );
+ fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" );
rv = IOServiceGetMatchingServices(masterPort, hidMatch, &hidIterator);
if (rv != kIOReturnSuccess || !hidIterator) {
rv = IOServiceGetMatchingServices(masterPort, hidMatch, &hidIterator);
if (rv != kIOReturnSuccess || !hidIterator) {
- fgWarning( "%s", "no joystick (HID) devices found" );
+ fgWarning( "no joystick (HID) devices found" );
rv = IORegistryEntryGetParentEntry (ioDev, kIOServicePlane, &parent1);
if (rv != kIOReturnSuccess) {
rv = IORegistryEntryGetParentEntry (ioDev, kIOServicePlane, &parent1);
if (rv != kIOReturnSuccess) {
- fgWarning ( "%s", "error getting device entry parent");
+ fgWarning ( "error getting device entry parent");
return NULL;
}
rv = IORegistryEntryGetParentEntry (parent1, kIOServicePlane, &parent2);
if (rv != kIOReturnSuccess) {
return NULL;
}
rv = IORegistryEntryGetParentEntry (parent1, kIOServicePlane, &parent2);
if (rv != kIOReturnSuccess) {
- fgWarning ( "%s", "error getting device entry parent 2");
+ fgWarning ( "error getting device entry parent 2");
rv = IORegistryEntryCreateCFProperties( ioDev /*parent2*/,
&cfProperties, kCFAllocatorDefault, kNilOptions);
if (rv != kIOReturnSuccess || !cfProperties) {
rv = IORegistryEntryCreateCFProperties( ioDev /*parent2*/,
&cfProperties, kCFAllocatorDefault, kNilOptions);
if (rv != kIOReturnSuccess || !cfProperties) {
- fgWarning ( "%s", "error getting device properties");
+ fgWarning ( "error getting device properties");
- printf("input type element has weird usage (%x)\n", usage);
+ fgWarning ( "input type element has weird usage (%x)", usage);
break;
}
} else if (page == kHIDPage_Button) {
printf(" button\n");
fghJoystickAddButtonElement((CFDictionaryRef) element);
} else
break;
}
} else if (page == kHIDPage_Button) {
printf(" button\n");
fghJoystickAddButtonElement((CFDictionaryRef) element);
} else
- printf("input type element has weird page (%x)\n", page);
+ fgWarning ( "input type element has weird page (%x)", page);
break;
case kIOHIDElementTypeCollection:
break;
case kIOHIDElementTypeCollection:
#if TARGET_HOST_MAC_OSX
if( joy->id >= numDevices )
{
#if TARGET_HOST_MAC_OSX
if( joy->id >= numDevices )
{
- fgWarning( "%s", "device index out of range in fgJoystickOpen()" );
+ fgWarning( "device index out of range in fgJoystickOpen()" );
if( rv != kIOReturnSuccess )
{
if( rv != kIOReturnSuccess )
{
- fgWarning( "%s", "error creating plugin for io device" );
+ fgWarning( "error creating plugin for io device" );
);
if( pluginResult != S_OK )
);
if( pluginResult != S_OK )
- fgWarning ( "%s", "QI-ing IO plugin to HID Device interface failed" );
+ fgWarning ( "QI-ing IO plugin to HID Device interface failed" );
( *plugin )->Release( plugin ); /* don't leak a ref */
if( joy->hidDev == NULL )
( *plugin )->Release( plugin ); /* don't leak a ref */
if( joy->hidDev == NULL )
joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
if( joy->os->fd < 0 && errno == EACCES )
joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
if( joy->os->fd < 0 && errno == EACCES )
- fgWarning ( "%s exists but is not readable by you\n", joy->os->fname );
+ fgWarning ( "%s exists but is not readable by you", joy->os->fname );
joy->error =( joy->os->fd < 0 );
joy->error =( joy->os->fd < 0 );
void fgJoystickInit( int ident )
{
if( ident >= MAX_NUM_JOYSTICKS )
void fgJoystickInit( int ident )
{
if( ident >= MAX_NUM_JOYSTICKS )
- fgError( "Too large a joystick number" );
+ fgError( "Too large a joystick number: %d", ident );
if( fgJoystick[ ident ] )
if( fgJoystick[ ident ] )
- fgError( "illegal attempt to initialize joystick device" );
+ fgError( "illegal attempt to initialize joystick device again" );
fgJoystick[ ident ] =
( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 );
fgJoystick[ ident ] =
( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 );
IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
if( rv != kIOReturnSuccess )
{
IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
if( rv != kIOReturnSuccess )
{
- fgWarning( "%s", "error getting master Mach port" );
+ fgWarning( "error getting master Mach port" );
return;
}
fghJoystickFindDevices( masterPort );
return;
}
fghJoystickFindDevices( masterPort );
!CFStringGetCString( ( CFStringRef )ref, name, 128,
CFStringGetSystemEncoding( ) ) )
{
!CFStringGetCString( ( CFStringRef )ref, name, 128,
CFStringGetSystemEncoding( ) ) )
{
- fgWarning( "%s", "error getting device name" );
+ fgWarning( "error getting device name" );
name[ 0 ] = '\0';
}
#endif
name[ 0 ] = '\0';
}
#endif
err = select( socket+1, &fdset, NULL, NULL, &wait );
if( -1 == err )
err = select( socket+1, &fdset, NULL, NULL, &wait );
if( -1 == err )
- fgWarning ( "freeglut select() error: %d\n", errno );
+ fgWarning ( "freeglut select() error: %d", errno );
}
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
}
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
- fgWarning( "Uknown X visibility state: %d",
+ fgWarning( "Unknown X visibility state: %d",
event.xvisibility.state );
break;
}
event.xvisibility.state );
break;
}
- fgWarning( "Unknown wParam type 0x%x\n", wParam );
+ fgWarning( "Unknown wParam type 0x%x", wParam );
- fgWarning( "glutSetOption(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutSetOption(): missing enum handle %d", eWhat );
- fgWarning( "glutGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutGet(): missing enum handle %d", eWhat );
return GLUT_KEY_REPEAT_DEFAULT;
default:
return GLUT_KEY_REPEAT_DEFAULT;
default:
- fgWarning( "glutDeviceGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
- fgWarning( "glutLayerGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
window = fgWindowByID( ID );
if( window == NULL )
{
window = fgWindowByID( ID );
if( window == NULL )
{
- fgWarning( "glutSetWindow(): window ID %i not found!", ID );
+ fgWarning( "glutSetWindow(): window ID %d not found!", ID );