From 67f242b7dd68bea7dea467f9b5265c8448b6655e Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Fri, 17 Oct 2014 16:09:00 +0000 Subject: [PATCH] renamed all references to freeglut_xxx files (their old names) to fg_xxx git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1717 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_ext.h | 26 +++++++++++------------ include/GL/freeglut_std.h | 34 +++++++++++++++---------------- src/android/fg_internal_android.h | 4 ++-- src/android/fg_runtime_android.c | 2 +- src/blackberry/fg_internal_blackberry.h | 4 ++-- src/egl/fg_display_egl.c | 2 +- src/egl/fg_internal_egl.h | 4 ++-- src/egl/fg_window_egl.c | 2 +- src/fg_callbacks.c | 2 +- src/fg_cursor.c | 2 +- src/fg_display.c | 2 +- src/fg_ext.c | 2 +- src/fg_font.c | 4 ++-- src/fg_gamemode.c | 2 +- src/fg_geometry.c | 2 +- src/fg_init.c | 2 +- src/fg_input_devices.c | 2 +- src/fg_internal.h | 20 +++++++++--------- src/fg_joystick.c | 2 +- src/fg_main.c | 2 +- src/fg_menu.c | 6 +++--- src/fg_misc.c | 2 +- src/fg_overlay.c | 2 +- src/fg_state.c | 2 +- src/fg_stroke_mono_roman.c | 2 +- src/fg_stroke_roman.c | 2 +- src/fg_structure.c | 10 ++++----- src/fg_teapot.c | 2 +- src/fg_teapot_data.h | 2 +- src/fg_videoresize.c | 2 +- src/fg_window.c | 2 +- src/mswin/fg_cursor_mswin.c | 2 +- src/mswin/fg_display_mswin.c | 2 +- src/mswin/fg_gamemode_mswin.c | 2 +- src/mswin/fg_init_mswin.c | 5 ++--- src/mswin/fg_input_devices_mswin.c | 2 +- src/mswin/fg_internal_mswin.h | 2 +- src/mswin/fg_joystick_mswin.c | 2 +- src/mswin/fg_main_mswin.c | 2 +- src/mswin/fg_menu_mswin.c | 2 +- src/mswin/fg_spaceball_mswin.c | 2 +- src/mswin/fg_state_mswin.c | 2 +- src/mswin/fg_structure_mswin.c | 2 +- src/mswin/fg_window_mswin.c | 2 +- src/x11/fg_cursor_x11.c | 2 +- src/x11/fg_display_x11_glx.c | 2 +- src/x11/fg_ext_x11.c | 2 +- src/x11/fg_gamemode_x11.c | 2 +- src/x11/fg_init_x11.c | 2 +- src/x11/fg_input_devices_x11.c | 2 +- src/x11/fg_internal_x11.h | 10 ++++----- src/x11/fg_internal_x11_glx.h | 2 +- src/x11/fg_joystick_x11.c | 2 +- src/x11/fg_main_x11.c | 2 +- src/x11/fg_menu_x11.c | 2 +- src/x11/fg_state_x11.c | 4 ++-- src/x11/fg_structure_x11.c | 2 +- src/x11/fg_window_x11.c | 2 +- src/x11/fg_xinput_x11.c | 2 +- 59 files changed, 112 insertions(+), 113 deletions(-) diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 9c3eee1..b856959 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -103,7 +103,7 @@ #define GLUT_AUX4 0x8000 /* - * Context-related flags, see freeglut_state.c + * Context-related flags, see fg_state.c * Set the requested OpenGL version */ #define GLUT_INIT_MAJOR_VERSION 0x0200 @@ -112,27 +112,27 @@ #define GLUT_INIT_PROFILE 0x0203 /* - * Flags for glutInitContextFlags, see freeglut_init.c + * Flags for glutInitContextFlags, see fg_init.c */ #define GLUT_DEBUG 0x0001 #define GLUT_FORWARD_COMPATIBLE 0x0002 /* - * Flags for glutInitContextProfile, see freeglut_init.c + * Flags for glutInitContextProfile, see fg_init.c */ #define GLUT_CORE_PROFILE 0x0001 #define GLUT_COMPATIBILITY_PROFILE 0x0002 /* - * Process loop function, see freeglut_main.c + * Process loop function, see fg_main.c */ FGAPI void FGAPIENTRY glutMainLoopEvent( void ); FGAPI void FGAPIENTRY glutLeaveMainLoop( void ); FGAPI void FGAPIENTRY glutExit ( void ); /* - * Window management functions, see freeglut_window.c + * Window management functions, see fg_window.c */ FGAPI void FGAPIENTRY glutFullScreenToggle( void ); FGAPI void FGAPIENTRY glutLeaveFullScreen( void ); @@ -143,7 +143,7 @@ FGAPI void FGAPIENTRY glutLeaveFullScreen( void ); FGAPI void FGAPIENTRY glutSetMenuFont( int menuID, void* font ); /* - * Window-specific callback functions, see freeglut_callbacks.c + * Window-specific callback functions, see fg_callbacks.c */ FGAPI void FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) ); FGAPI void FGAPIENTRY glutPositionFunc( void (* callback)( int, int ) ); @@ -153,7 +153,7 @@ FGAPI void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) ); FGAPI void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) ); /* - * State setting and retrieval functions, see freeglut_state.c + * State setting and retrieval functions, see fg_state.c */ FGAPI void FGAPIENTRY glutSetOption ( GLenum option_flag, int value ); FGAPI int * FGAPIENTRY glutGetModeValues(GLenum mode, int * size); @@ -164,7 +164,7 @@ FGAPI void* FGAPIENTRY glutGetMenuData( void ); FGAPI void FGAPIENTRY glutSetMenuData(void* data); /* - * Font stuff, see freeglut_font.c + * Font stuff, see fg_font.c */ FGAPI int FGAPIENTRY glutBitmapHeight( void* font ); FGAPI GLfloat FGAPIENTRY glutStrokeHeight( void* font ); @@ -172,7 +172,7 @@ FGAPI void FGAPIENTRY glutBitmapString( void* font, const unsigned char *stri FGAPI void FGAPIENTRY glutStrokeString( void* font, const unsigned char *string ); /* - * Geometry functions, see freeglut_geometry.c + * Geometry functions, see fg_geometry.c */ FGAPI void FGAPIENTRY glutWireRhombicDodecahedron( void ); FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void ); @@ -182,7 +182,7 @@ FGAPI void FGAPIENTRY glutWireCylinder( double radius, double height, GLint s FGAPI void FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks); /* - * Rest of functions for rendering Newell's teaset, found in freeglut_teapot.c + * Rest of functions for rendering Newell's teaset, found in fg_teapot.c * NB: front facing polygons have clockwise winding, not counter clockwise */ FGAPI void FGAPIENTRY glutWireTeacup( double size ); @@ -191,7 +191,7 @@ FGAPI void FGAPIENTRY glutWireTeaspoon( double size ); FGAPI void FGAPIENTRY glutSolidTeaspoon( double size ); /* - * Extension functions, see freeglut_ext.c + * Extension functions, see fg_ext.c */ typedef void (*GLUTproc)(); FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName ); @@ -210,7 +210,7 @@ FGAPI void FGAPIENTRY glutMultiMotionFunc( void (* callback)( int, int, int ) ); FGAPI void FGAPIENTRY glutMultiPassiveFunc( void (* callback)( int, int, int ) ); /* - * Joystick functions, see freeglut_joystick.c + * Joystick functions, see fg_joystick.c */ /* USE OF THESE FUNCTIONS IS DEPRECATED !!!!! */ /* If you have a serious need for these functions in your application, please either @@ -233,7 +233,7 @@ void glutJoystickGetMaxRange( int ident, float *axes ); void glutJoystickGetCenter( int ident, float *axes ); /* - * Initialization functions, see freeglut_init.c + * Initialization functions, see fg_init.c */ /* to get the typedef for va_list */ #include diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index b24fced..0e4ce6c 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -417,12 +417,12 @@ FGAPI void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode ); FGAPI void FGAPIENTRY glutInitDisplayString( const char* displayMode ); /* - * Process loop function, see freeglut_main.c + * Process loop function, see fg_main.c */ FGAPI void FGAPIENTRY glutMainLoop( void ); /* - * Window management functions, see freeglut_window.c + * Window management functions, see fg_window.c */ FGAPI int FGAPIENTRY glutCreateWindow( const char* title ); FGAPI int FGAPIENTRY glutCreateSubWindow( int window, int x, int y, int width, int height ); @@ -441,20 +441,20 @@ FGAPI void FGAPIENTRY glutPopWindow( void ); FGAPI void FGAPIENTRY glutFullScreen( void ); /* - * Display-connected functions, see freeglut_display.c + * Display-related functions, see fg_display.c */ FGAPI void FGAPIENTRY glutPostWindowRedisplay( int window ); FGAPI void FGAPIENTRY glutPostRedisplay( void ); FGAPI void FGAPIENTRY glutSwapBuffers( void ); /* - * Mouse cursor functions, see freeglut_cursor.c + * Mouse cursor functions, see fg_cursor.c */ FGAPI void FGAPIENTRY glutWarpPointer( int x, int y ); FGAPI void FGAPIENTRY glutSetCursor( int cursor ); /* - * Overlay stuff, see freeglut_overlay.c + * Overlay stuff, see fg_overlay.c */ FGAPI void FGAPIENTRY glutEstablishOverlay( void ); FGAPI void FGAPIENTRY glutRemoveOverlay( void ); @@ -465,7 +465,7 @@ FGAPI void FGAPIENTRY glutShowOverlay( void ); FGAPI void FGAPIENTRY glutHideOverlay( void ); /* - * Menu stuff, see freeglut_menu.c + * Menu stuff, see fg_menu.c */ FGAPI int FGAPIENTRY glutCreateMenu( void (* callback)( int menu ) ); FGAPI void FGAPIENTRY glutDestroyMenu( int menu ); @@ -480,13 +480,13 @@ FGAPI void FGAPIENTRY glutAttachMenu( int button ); FGAPI void FGAPIENTRY glutDetachMenu( int button ); /* - * Global callback functions, see freeglut_callbacks.c + * Global callback functions, see fg_callbacks.c */ FGAPI void FGAPIENTRY glutTimerFunc( unsigned int time, void (* callback)( int ), int value ); FGAPI void FGAPIENTRY glutIdleFunc( void (* callback)( void ) ); /* - * Window-specific callback functions, see freeglut_callbacks.c + * Window-specific callback functions, see fg_callbacks.c */ FGAPI void FGAPIENTRY glutKeyboardFunc( void (* callback)( unsigned char, int, int ) ); FGAPI void FGAPIENTRY glutSpecialFunc( void (* callback)( int, int, int ) ); @@ -515,7 +515,7 @@ FGAPI void FGAPIENTRY glutTabletMotionFunc( void (* callback)( int, int ) ); FGAPI void FGAPIENTRY glutTabletButtonFunc( void (* callback)( int, int, int, int ) ); /* - * State setting and retrieval functions, see freeglut_state.c + * State setting and retrieval functions, see fg_state.c */ FGAPI int FGAPIENTRY glutGet( GLenum query ); FGAPI int FGAPIENTRY glutDeviceGet( GLenum query ); @@ -523,7 +523,7 @@ FGAPI int FGAPIENTRY glutGetModifiers( void ); FGAPI int FGAPIENTRY glutLayerGet( GLenum query ); /* - * Font stuff, see freeglut_font.c + * Font stuff, see fg_font.c */ FGAPI void FGAPIENTRY glutBitmapCharacter( void* font, int character ); FGAPI int FGAPIENTRY glutBitmapWidth( void* font, int character ); @@ -533,7 +533,7 @@ FGAPI int FGAPIENTRY glutBitmapLength( void* font, const unsigned char* stri FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* string ); /* - * Geometry functions, see freeglut_geometry.c + * Geometry functions, see fg_geometry.c */ FGAPI void FGAPIENTRY glutWireCube( double size ); @@ -554,14 +554,14 @@ FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); /* - * Teapot rendering functions, found in freeglut_teapot.c + * Teapot rendering functions, found in fg_teapot.c * NB: front facing polygons have clockwise winding, not counter clockwise */ FGAPI void FGAPIENTRY glutWireTeapot( double size ); FGAPI void FGAPIENTRY glutSolidTeapot( double size ); /* - * Game mode functions, see freeglut_gamemode.c + * Game mode functions, see fg_gamemode.c */ FGAPI void FGAPIENTRY glutGameModeString( const char* string ); FGAPI int FGAPIENTRY glutEnterGameMode( void ); @@ -569,7 +569,7 @@ FGAPI void FGAPIENTRY glutLeaveGameMode( void ); FGAPI int FGAPIENTRY glutGameModeGet( GLenum query ); /* - * Video resize functions, see freeglut_videoresize.c + * Video resize functions, see fg_videoresize.c */ FGAPI int FGAPIENTRY glutVideoResizeGet( GLenum query ); FGAPI void FGAPIENTRY glutSetupVideoResizing( void ); @@ -578,21 +578,21 @@ FGAPI void FGAPIENTRY glutVideoResize( int x, int y, int width, int height ); FGAPI void FGAPIENTRY glutVideoPan( int x, int y, int width, int height ); /* - * Colormap functions, see freeglut_misc.c + * Colormap functions, see fg_misc.c */ FGAPI void FGAPIENTRY glutSetColor( int color, GLfloat red, GLfloat green, GLfloat blue ); FGAPI GLfloat FGAPIENTRY glutGetColor( int color, int component ); FGAPI void FGAPIENTRY glutCopyColormap( int window ); /* - * Misc keyboard and joystick functions, see freeglut_misc.c + * Misc keyboard and joystick functions, see fg_misc.c */ FGAPI void FGAPIENTRY glutIgnoreKeyRepeat( int ignore ); FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); FGAPI void FGAPIENTRY glutForceJoystickFunc( void ); /* - * Misc functions, see freeglut_misc.c + * Misc functions, see fg_misc.c */ FGAPI int FGAPIENTRY glutExtensionSupported( const char* extension ); FGAPI void FGAPIENTRY glutReportErrors( void ); diff --git a/src/android/fg_internal_android.h b/src/android/fg_internal_android.h index 1888b1b..5504b44 100644 --- a/src/android/fg_internal_android.h +++ b/src/android/fg_internal_android.h @@ -32,7 +32,7 @@ #include "egl/fg_internal_egl.h" /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay; struct android_app; struct tagSFG_PlatformDisplay @@ -68,7 +68,7 @@ struct touchscreen { /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ diff --git a/src/android/fg_runtime_android.c b/src/android/fg_runtime_android.c index 731c308..d96f3af 100644 --- a/src/android/fg_runtime_android.c +++ b/src/android/fg_runtime_android.c @@ -54,7 +54,7 @@ #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "FreeGLUT-jnicb", __VA_ARGS__)) #define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "FreeGLUT-jnicb", __VA_ARGS__)) -/* Cf. freeglut_main_android.c */ +/* Cf. fg_main_android.c */ extern int32_t handle_input(struct android_app* app, AInputEvent* event); extern void handle_cmd(struct android_app* app, int32_t cmd); diff --git a/src/blackberry/fg_internal_blackberry.h b/src/blackberry/fg_internal_blackberry.h index d06f9e1..effb5d5 100644 --- a/src/blackberry/fg_internal_blackberry.h +++ b/src/blackberry/fg_internal_blackberry.h @@ -37,7 +37,7 @@ #include /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay; struct tagSFG_PlatformDisplay { @@ -76,7 +76,7 @@ struct touchscreen { /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ diff --git a/src/egl/fg_display_egl.c b/src/egl/fg_display_egl.c index 896b61a..f094221 100644 --- a/src/egl/fg_display_egl.c +++ b/src/egl/fg_display_egl.c @@ -1,5 +1,5 @@ /* - * freeglut_display_android.c + * fg_display_android.c * * Display message posting, context buffer swapping. * diff --git a/src/egl/fg_internal_egl.h b/src/egl/fg_internal_egl.h index 8106a70..efe0147 100644 --- a/src/egl/fg_internal_egl.h +++ b/src/egl/fg_internal_egl.h @@ -1,5 +1,5 @@ /* - * freeglut_internal_android.h + * fg_internal_android.h * * The freeglut library private include file. * @@ -29,7 +29,7 @@ #include /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ struct tagSFG_Window; struct tagSFG_PlatformDisplayEGL { diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c index 6b98bba..6298032 100644 --- a/src/egl/fg_window_egl.c +++ b/src/egl/fg_window_egl.c @@ -1,5 +1,5 @@ /* - * freeglut_display_android.c + * fg_display_android.c * * Window management methods for EGL * diff --git a/src/fg_callbacks.c b/src/fg_callbacks.c index 7d5fca6..11924b3 100644 --- a/src/fg_callbacks.c +++ b/src/fg_callbacks.c @@ -1,5 +1,5 @@ /* - * freeglut_callbacks.c + * fg_callbacks.c * * The callbacks setting methods. * diff --git a/src/fg_cursor.c b/src/fg_cursor.c index 007898f..bd60b04 100644 --- a/src/fg_cursor.c +++ b/src/fg_cursor.c @@ -1,5 +1,5 @@ /* - * freeglut_cursor.c + * fg_cursor.c * * The mouse cursor related stuff. * diff --git a/src/fg_display.c b/src/fg_display.c index 3b65d83..280bb99 100644 --- a/src/fg_display.c +++ b/src/fg_display.c @@ -1,5 +1,5 @@ /* - * freeglut_display.c + * fg_display.c * * Display message posting, context buffer swapping. * diff --git a/src/fg_ext.c b/src/fg_ext.c index 6835854..ab601c7 100644 --- a/src/fg_ext.c +++ b/src/fg_ext.c @@ -1,5 +1,5 @@ /* - * freeglut_ext.c + * fg_ext.c * * Functions related to OpenGL extensions. * diff --git a/src/fg_font.c b/src/fg_font.c index 9e73949..4a23e1d 100644 --- a/src/fg_font.c +++ b/src/fg_font.c @@ -1,5 +1,5 @@ /* - * freeglut_font.c + * fg_font.c * * Bitmap and stroke fonts displaying. * @@ -37,7 +37,7 @@ /* -- IMPORT DECLARATIONS -------------------------------------------------- */ /* - * These are the font faces defined in freeglut_font_data.c file: + * These are the font faces defined in fg_font_data.c file: */ extern SFG_Font fgFontFixed8x13; extern SFG_Font fgFontFixed9x15; diff --git a/src/fg_gamemode.c b/src/fg_gamemode.c index 4b49dcc..f8559d4 100644 --- a/src/fg_gamemode.c +++ b/src/fg_gamemode.c @@ -1,5 +1,5 @@ /* - * freeglut_gamemode.c + * fg_gamemode.c * * The game mode handling code. * diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 05cf1c9..e41f01d 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -1,5 +1,5 @@ /* - * freeglut_geometry.c + * fg_geometry.c * * Freeglut geometry rendering methods. * diff --git a/src/fg_init.c b/src/fg_init.c index fda824d..ed9f8d3 100644 --- a/src/fg_init.c +++ b/src/fg_init.c @@ -1,5 +1,5 @@ /* - * freeglut_init.c + * fg_init.c * * Various freeglut initialization functions. * diff --git a/src/fg_input_devices.c b/src/fg_input_devices.c index becff3d..930d93b 100644 --- a/src/fg_input_devices.c +++ b/src/fg_input_devices.c @@ -1,5 +1,5 @@ /* - * freeglut_input_devices.c + * fg_input_devices.c * * Handles miscellaneous input devices via direct serial-port access. * Proper X11 XInput device support is not yet supported. diff --git a/src/fg_internal.h b/src/fg_internal.h index 8c0be9b..c37f1e4 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -353,7 +353,7 @@ struct tagSFG_State FGWarning WarningFunc; /* User defined warning handler */ }; -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_Display SFG_Display; struct tagSFG_Display { @@ -791,7 +791,7 @@ struct tagSFG_StrokeFont /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ @@ -942,7 +942,7 @@ void fgDestroyStructure( void ); /* * Window creation, opening, closing and destruction. * Also CallBack clearing/initialization. - * Defined in freeglut_structure.c, freeglut_window.c. + * Defined in fg_structure.c, fg_window.c. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, GLboolean positionUse, int x, int y, @@ -958,11 +958,11 @@ void fgAddToWindowDestroyList ( SFG_Window* window ); void fgCloseWindows (); void fgDestroyWindow( SFG_Window* window ); -/* Menu creation and destruction. Defined in freeglut_structure.c */ +/* Menu creation and destruction. Defined in fg_structure.c */ SFG_Menu* fgCreateMenu( FGCBMenu menuCallback ); void fgDestroyMenu( SFG_Menu* menu ); -/* Joystick device management functions, defined in freeglut_joystick.c */ +/* Joystick device management functions, defined in fg_joystick.c */ int fgJoystickDetect( void ); void fgInitialiseJoysticks( void ); void fgJoystickClose( void ); @@ -973,7 +973,7 @@ int fgInputDeviceDetect( void ); void fgInitialiseInputDevices( void ); void fgInputDeviceClose( void ); -/* spaceball device functions, defined in freeglut_spaceball.c */ +/* spaceball device functions, defined in fg_spaceball.c */ void fgInitialiseSpaceball( void ); void fgSpaceballClose( void ); void fgSpaceballSetWindow( SFG_Window *window ); @@ -994,7 +994,7 @@ void fgSetCursor ( SFG_Window *window, int cursorID ); * * where window is the enumerated (sub)window pointer (SFG_Window *), * and userData is the a custom user-supplied pointer. Functions - * are defined and exported from freeglut_structure.c file. + * are defined and exported from fg_structure.c file. */ void fgEnumWindows( FGCBWindowEnumerator enumCallback, SFG_Enumerator* enumerator ); void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback, @@ -1003,14 +1003,14 @@ void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback, /* * fgWindowByHandle returns a (SFG_Window *) value pointing to the * first window in the queue matching the specified window handle. - * The function is defined in freeglut_structure.c file. + * The function is defined in fg_structure.c file. */ SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow ); /* * This function is similiar to the previous one, except it is * looking for a specified (sub)window identifier. The function - * is defined in freeglut_structure.c file. + * is defined in fg_structure.c file. */ SFG_Window* fgWindowByID( int windowID ); @@ -1038,7 +1038,7 @@ void fgDeactivateMenu( SFG_Window *window ); /* * This function gets called just before the buffers swap, so that * freeglut can display the pull-down menus via OpenGL. The function - * is defined in freeglut_menu.c file. + * is defined in fg_menu.c file. */ void fgDisplayMenu( void ); diff --git a/src/fg_joystick.c b/src/fg_joystick.c index ab6f401..9831fb1 100644 --- a/src/fg_joystick.c +++ b/src/fg_joystick.c @@ -1,5 +1,5 @@ /* - * freeglut_joystick.c + * fg_joystick.c * * Joystick handling code * diff --git a/src/fg_main.c b/src/fg_main.c index f409b33..b387068 100644 --- a/src/fg_main.c +++ b/src/fg_main.c @@ -1,5 +1,5 @@ /* - * freeglut_main.c + * fg_main.c * * The windows message processing methods. * diff --git a/src/fg_menu.c b/src/fg_menu.c index 9e20d5d..9d9606d 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -1,5 +1,5 @@ /* - * freeglut_menu.c + * fg_menu.c * * Pull-down menu creation and handling. * @@ -782,7 +782,7 @@ void fghCalculateMenuBoxSize( void ) */ int FGAPIENTRY glutCreateMenu( FGCBMenu callback ) { - /* The menu object creation code resides in freeglut_structure.c */ + /* The menu object creation code resides in fg_structure.c */ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" ); if (fgState.ActiveMenus) fgError("Menu manipulation not allowed while menus in use."); @@ -804,7 +804,7 @@ void FGAPIENTRY glutDestroyMenu( int menuID ) if (fgState.ActiveMenus) fgError("Menu manipulation not allowed while menus in use."); - /* The menu object destruction code resides in freeglut_structure.c */ + /* The menu object destruction code resides in fg_structure.c */ fgDestroyMenu( menu ); } diff --git a/src/fg_misc.c b/src/fg_misc.c index d6a38e3..c6d6c17 100644 --- a/src/fg_misc.c +++ b/src/fg_misc.c @@ -1,5 +1,5 @@ /* - * freeglut_misc.c + * fg_misc.c * * Functions that didn't fit anywhere else... * diff --git a/src/fg_overlay.c b/src/fg_overlay.c index 4a59bfe..dacdea6 100644 --- a/src/fg_overlay.c +++ b/src/fg_overlay.c @@ -1,5 +1,5 @@ /* - * freeglut_overlay.c + * fg_overlay.c * * Overlay management functions (as defined by GLUT API) * diff --git a/src/fg_state.c b/src/fg_state.c index 8f0b3c9..cc93892 100644 --- a/src/fg_state.c +++ b/src/fg_state.c @@ -1,5 +1,5 @@ /* - * freeglut_state.c + * fg_state.c * * Freeglut state query methods. * diff --git a/src/fg_stroke_mono_roman.c b/src/fg_stroke_mono_roman.c index 615526d..e60ff71 100644 --- a/src/fg_stroke_mono_roman.c +++ b/src/fg_stroke_mono_roman.c @@ -1,5 +1,5 @@ /* - * freeglut_stroke_mono_roman.c + * fg_stroke_mono_roman.c * * freeglut Monospace Roman stroke font definition * diff --git a/src/fg_stroke_roman.c b/src/fg_stroke_roman.c index 8972d8a..6bd4739 100644 --- a/src/fg_stroke_roman.c +++ b/src/fg_stroke_roman.c @@ -1,5 +1,5 @@ /* - * freeglut_stroke_roman.c + * fg_stroke_roman.c * * freeglut Roman stroke font definition * diff --git a/src/fg_structure.c b/src/fg_structure.c index 8e1b966..5a6ce95 100644 --- a/src/fg_structure.c +++ b/src/fg_structure.c @@ -1,5 +1,5 @@ /* - * freeglut_structure.c + * fg_structure.c * * Windows and menus need tree structure * @@ -100,7 +100,7 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, /* * Open the window now. The fgOpenWindow() function is system - * dependant, and resides in freeglut_window.c. Uses fgState. + * dependant, and resides in fg_window.c. Uses fgState. */ fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode, (GLboolean)(parent ? GL_TRUE : GL_FALSE) ); @@ -190,7 +190,7 @@ void fgCloseWindows( ) /* * This function destroys a window and all of its subwindows. Actually, - * another function, defined in freeglut_window.c is called, but this is + * another function, defined in fg_window.c is called, but this is * a whole different story... */ void fgDestroyWindow( SFG_Window* window ) @@ -465,7 +465,7 @@ static void fghcbWindowByHandle( SFG_Window *window, /* * fgWindowByHandle returns a (SFG_Window *) value pointing to the * first window in the queue matching the specified window handle. - * The function is defined in freeglut_structure.c file. + * The function is defined in fg_structure.c file. */ SFG_Window* fgWindowByHandle ( SFG_WindowHandleType hWindow ) { @@ -506,7 +506,7 @@ static void fghcbWindowByID( SFG_Window *window, SFG_Enumerator *enumerator ) /* * This function is similar to the previous one, except it is * looking for a specified (sub)window identifier. The function - * is defined in freeglut_structure.c file. + * is defined in fg_structure.c file. */ SFG_Window* fgWindowByID( int windowID ) { diff --git a/src/fg_teapot.c b/src/fg_teapot.c index cdf48f6..a378b9b 100644 --- a/src/fg_teapot.c +++ b/src/fg_teapot.c @@ -1,5 +1,5 @@ /* - * freeglut_teapot.c + * fg_teapot.c * * Teapot(tm) rendering code. * diff --git a/src/fg_teapot_data.h b/src/fg_teapot_data.h index 16e8415..055886d 100644 --- a/src/fg_teapot_data.h +++ b/src/fg_teapot_data.h @@ -1,5 +1,5 @@ /* - * freeglut_teapot_data.h + * fg_teapot_data.h * * The freeglut library teapot data include file. * diff --git a/src/fg_videoresize.c b/src/fg_videoresize.c index 6f8d1d1..67148c7 100644 --- a/src/fg_videoresize.c +++ b/src/fg_videoresize.c @@ -1,5 +1,5 @@ /* - * freeglut_videoresize.c + * fg_videoresize.c * * Video resize functions (as defined by GLUT API) * diff --git a/src/fg_window.c b/src/fg_window.c index adf2a0a..09fcddf 100644 --- a/src/fg_window.c +++ b/src/fg_window.c @@ -1,5 +1,5 @@ /* - * freeglut_window.c + * fg_window.c * * Window management methods. * diff --git a/src/mswin/fg_cursor_mswin.c b/src/mswin/fg_cursor_mswin.c index 7bc5cae..dc1c0d8 100644 --- a/src/mswin/fg_cursor_mswin.c +++ b/src/mswin/fg_cursor_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_cursor_mswin.c + * fg_cursor_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_display_mswin.c b/src/mswin/fg_display_mswin.c index 6a58412..7ba6f32 100644 --- a/src/mswin/fg_display_mswin.c +++ b/src/mswin/fg_display_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_display_mswin.c + * fg_display_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_gamemode_mswin.c b/src/mswin/fg_gamemode_mswin.c index 48d9c9e..389c20d 100644 --- a/src/mswin/fg_gamemode_mswin.c +++ b/src/mswin/fg_gamemode_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_gamemode_mswin.c + * fg_gamemode_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_init_mswin.c b/src/mswin/fg_init_mswin.c index c47116d..b1c51da 100644 --- a/src/mswin/fg_init_mswin.c +++ b/src/mswin/fg_init_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_init_mswin.c + * fg_init_mswin.c * * The Windows-specific mouse cursor related stuff. * @@ -34,6 +34,7 @@ extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); extern void fgPlatformInitSystemTime(); +extern void fghCloseInputDevices(void); /* @@ -138,8 +139,6 @@ void fgPlatformInitialize( const char* displayName ) /* Platform-Specific Deinitialization Functions: */ -extern void fghCloseInputDevices ( void ); - void fgPlatformDeinitialiseInputDevices ( void ) { #if !defined(_WIN32_WCE) diff --git a/src/mswin/fg_input_devices_mswin.c b/src/mswin/fg_input_devices_mswin.c index ba230d4..0914fb1 100644 --- a/src/mswin/fg_input_devices_mswin.c +++ b/src/mswin/fg_input_devices_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_input_devices_mswin.c + * fg_input_devices_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_internal_mswin.h b/src/mswin/fg_internal_mswin.h index 1ec651f..1209fc4 100644 --- a/src/mswin/fg_internal_mswin.h +++ b/src/mswin/fg_internal_mswin.h @@ -1,5 +1,5 @@ /* - * freeglut_internal_mswin.h + * fg_internal_mswin.h * * The freeglut library private include file. * diff --git a/src/mswin/fg_joystick_mswin.c b/src/mswin/fg_joystick_mswin.c index aefa192..d584b59 100644 --- a/src/mswin/fg_joystick_mswin.c +++ b/src/mswin/fg_joystick_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_joystick_mswin.c + * fg_joystick_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c index 55280f1..f528dd1 100644 --- a/src/mswin/fg_main_mswin.c +++ b/src/mswin/fg_main_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_main_mswin.c + * fg_main_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_menu_mswin.c b/src/mswin/fg_menu_mswin.c index 33b59ba..27bc356 100644 --- a/src/mswin/fg_menu_mswin.c +++ b/src/mswin/fg_menu_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_menu_mswin.c + * fg_menu_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_spaceball_mswin.c b/src/mswin/fg_spaceball_mswin.c index 3a7af46..3726389 100644 --- a/src/mswin/fg_spaceball_mswin.c +++ b/src/mswin/fg_spaceball_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_spaceball_mswin.c + * fg_spaceball_mswin.c * * Spaceball support for Windows * diff --git a/src/mswin/fg_state_mswin.c b/src/mswin/fg_state_mswin.c index 7c510c5..b8cfb37 100644 --- a/src/mswin/fg_state_mswin.c +++ b/src/mswin/fg_state_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_state_mswin.c + * fg_state_mswin.c * * The Windows-specific state query methods. * diff --git a/src/mswin/fg_structure_mswin.c b/src/mswin/fg_structure_mswin.c index 8ccb33d..7f61697 100644 --- a/src/mswin/fg_structure_mswin.c +++ b/src/mswin/fg_structure_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_structure_mswin.c + * fg_structure_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/mswin/fg_window_mswin.c b/src/mswin/fg_window_mswin.c index 641ea53..39cdada 100644 --- a/src/mswin/fg_window_mswin.c +++ b/src/mswin/fg_window_mswin.c @@ -1,5 +1,5 @@ /* - * freeglut_window_mswin.c + * fg_window_mswin.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/x11/fg_cursor_x11.c b/src/x11/fg_cursor_x11.c index fcadb00..6d889f2 100644 --- a/src/x11/fg_cursor_x11.c +++ b/src/x11/fg_cursor_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_cursor_x11.c + * fg_cursor_x11.c * * The Windows-specific mouse cursor related stuff. * diff --git a/src/x11/fg_display_x11_glx.c b/src/x11/fg_display_x11_glx.c index bbf9061..5f68680 100644 --- a/src/x11/fg_display_x11_glx.c +++ b/src/x11/fg_display_x11_glx.c @@ -1,5 +1,5 @@ /* - * freeglut_display_x11.c + * fg_display_x11.c * * Display message posting, context buffer swapping. * diff --git a/src/x11/fg_ext_x11.c b/src/x11/fg_ext_x11.c index 925c0d5..6b63287 100644 --- a/src/x11/fg_ext_x11.c +++ b/src/x11/fg_ext_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_ext.c + * fg_ext.c * * Functions related to OpenGL extensions. * diff --git a/src/x11/fg_gamemode_x11.c b/src/x11/fg_gamemode_x11.c index c329ddc..3700ccf 100644 --- a/src/x11/fg_gamemode_x11.c +++ b/src/x11/fg_gamemode_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_gamemode_x11.c + * fg_gamemode_x11.c * * The game mode handling code. * diff --git a/src/x11/fg_init_x11.c b/src/x11/fg_init_x11.c index 3adf4e4..d2907c9 100644 --- a/src/x11/fg_init_x11.c +++ b/src/x11/fg_init_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_init_x11.c + * fg_init_x11.c * * Various freeglut initialization functions. * diff --git a/src/x11/fg_input_devices_x11.c b/src/x11/fg_input_devices_x11.c index d77e970..3c7e808 100644 --- a/src/x11/fg_input_devices_x11.c +++ b/src/x11/fg_input_devices_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_input_devices_x11.c + * fg_input_devices_x11.c * * Handles miscellaneous input devices via direct serial-port access. * Proper X11 XInput device support is not yet supported. diff --git a/src/x11/fg_internal_x11.h b/src/x11/fg_internal_x11.h index 64daf72..e6b512c 100644 --- a/src/x11/fg_internal_x11.h +++ b/src/x11/fg_internal_x11.h @@ -1,5 +1,5 @@ /* - * freeglut_internal_x11.h + * fg_internal_x11.h * * The freeglut library private include file. * @@ -49,7 +49,7 @@ /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay; struct tagSFG_PlatformDisplay { @@ -122,7 +122,7 @@ struct tagSFG_PlatformWindowState /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ # ifdef HAVE_SYS_IOCTL_H @@ -220,12 +220,12 @@ struct tagSFG_PlatformJoystick /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */ -/* spaceball device functions, defined in freeglut_spaceball.c */ +/* spaceball device functions, defined in fg_spaceball.c */ int fgIsSpaceballXEvent( const XEvent *ev ); void fgSpaceballHandleXEvent( const XEvent *ev ); /* - * Check if "hint" is present in "property" for "window". See freeglut_init.c + * Check if "hint" is present in "property" for "window". See fg_init.c */ int fgHintPresent(Window window, Atom property, Atom hint); diff --git a/src/x11/fg_internal_x11_glx.h b/src/x11/fg_internal_x11_glx.h index 9e8f9cf..0722a23 100644 --- a/src/x11/fg_internal_x11_glx.h +++ b/src/x11/fg_internal_x11_glx.h @@ -1,5 +1,5 @@ /* - * freeglut_internal_x11.h + * fg_internal_x11.h * * The freeglut library private include file. * diff --git a/src/x11/fg_joystick_x11.c b/src/x11/fg_joystick_x11.c index 1815577..9712d1c 100644 --- a/src/x11/fg_joystick_x11.c +++ b/src/x11/fg_joystick_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_joystick_x11.c + * fg_joystick_x11.c * * Joystick handling code * diff --git a/src/x11/fg_main_x11.c b/src/x11/fg_main_x11.c index 20cb37c..6d2d8a7 100644 --- a/src/x11/fg_main_x11.c +++ b/src/x11/fg_main_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_main_x11.c + * fg_main_x11.c * * The X11-specific windows message processing methods. * diff --git a/src/x11/fg_menu_x11.c b/src/x11/fg_menu_x11.c index 0443dcd..53de825 100644 --- a/src/x11/fg_menu_x11.c +++ b/src/x11/fg_menu_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_menu_x11.c + * fg_menu_x11.c * * Pull-down menu creation and handling. * diff --git a/src/x11/fg_state_x11.c b/src/x11/fg_state_x11.c index 43c0ab5..2b9f6d4 100644 --- a/src/x11/fg_state_x11.c +++ b/src/x11/fg_state_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_state_x11.c + * fg_state_x11.c * * X11-specific freeglut state query methods. * @@ -54,7 +54,7 @@ int fgPlatformGlutDeviceGet ( GLenum eWhat ) * but at least one X server has a bug where this causes a segfault. * * In XFree86/Xorg servers, a mouse wheel is seen as two buttons - * rather than an Axis; "freeglut_main.c" expects this when + * rather than an Axis; "fg_main.c" expects this when * checking for a wheel event. */ { diff --git a/src/x11/fg_structure_x11.c b/src/x11/fg_structure_x11.c index 3e22350..7deba22 100644 --- a/src/x11/fg_structure_x11.c +++ b/src/x11/fg_structure_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_structure.c + * fg_structure.c * * Windows and menus need tree structure * diff --git a/src/x11/fg_window_x11.c b/src/x11/fg_window_x11.c index ce4a52e..ae97b12 100644 --- a/src/x11/fg_window_x11.c +++ b/src/x11/fg_window_x11.c @@ -1,5 +1,5 @@ /* - * freeglut_window_x11.c + * fg_window_x11.c * * Window management methods for X11 * diff --git a/src/x11/fg_xinput_x11.c b/src/x11/fg_xinput_x11.c index b1415e9..cdc3abe 100644 --- a/src/x11/fg_xinput_x11.c +++ b/src/x11/fg_xinput_x11.c @@ -16,7 +16,7 @@ /* convert the XInput button state mask to the regular X mouse event button mask */ #define BUTTON_MASK(xistate) ((xistate) << 8) -/* import function from freeglut_main.c */ +/* import function from fg_main.c */ extern int fgPlatformGetModifiers( int state ); /* extension opcode for XInput */ -- 1.7.10.4