renamed all references to freeglut_xxx files (their old names) to fg_xxx

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1717 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2014-10-17 16:09:00 +00:00
parent 3bd2a31b9a
commit 9af2382e14
59 changed files with 112 additions and 113 deletions

View File

@ -103,7 +103,7 @@
#define GLUT_AUX4 0x8000 #define GLUT_AUX4 0x8000
/* /*
* Context-related flags, see freeglut_state.c * Context-related flags, see fg_state.c
* Set the requested OpenGL version * Set the requested OpenGL version
*/ */
#define GLUT_INIT_MAJOR_VERSION 0x0200 #define GLUT_INIT_MAJOR_VERSION 0x0200
@ -112,27 +112,27 @@
#define GLUT_INIT_PROFILE 0x0203 #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_DEBUG 0x0001
#define GLUT_FORWARD_COMPATIBLE 0x0002 #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_CORE_PROFILE 0x0001
#define GLUT_COMPATIBILITY_PROFILE 0x0002 #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 glutMainLoopEvent( void );
FGAPI void FGAPIENTRY glutLeaveMainLoop( void ); FGAPI void FGAPIENTRY glutLeaveMainLoop( void );
FGAPI void FGAPIENTRY glutExit ( 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 glutFullScreenToggle( void );
FGAPI void FGAPIENTRY glutLeaveFullScreen( void ); FGAPI void FGAPIENTRY glutLeaveFullScreen( void );
@ -143,7 +143,7 @@ FGAPI void FGAPIENTRY glutLeaveFullScreen( void );
FGAPI void FGAPIENTRY glutSetMenuFont( int menuID, void* font ); 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 glutMouseWheelFunc( void (* callback)( int, int, int, int ) );
FGAPI void FGAPIENTRY glutPositionFunc( void (* callback)( 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 ) ); 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 void FGAPIENTRY glutSetOption ( GLenum option_flag, int value );
FGAPI int * FGAPIENTRY glutGetModeValues(GLenum mode, int * size); FGAPI int * FGAPIENTRY glutGetModeValues(GLenum mode, int * size);
@ -164,7 +164,7 @@ FGAPI void* FGAPIENTRY glutGetMenuData( void );
FGAPI void FGAPIENTRY glutSetMenuData(void* data); 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 int FGAPIENTRY glutBitmapHeight( void* font );
FGAPI GLfloat FGAPIENTRY glutStrokeHeight( 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 ); 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 glutWireRhombicDodecahedron( void );
FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( 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); 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 * NB: front facing polygons have clockwise winding, not counter clockwise
*/ */
FGAPI void FGAPIENTRY glutWireTeacup( double size ); FGAPI void FGAPIENTRY glutWireTeacup( double size );
@ -191,7 +191,7 @@ FGAPI void FGAPIENTRY glutWireTeaspoon( double size );
FGAPI void FGAPIENTRY glutSolidTeaspoon( double size ); FGAPI void FGAPIENTRY glutSolidTeaspoon( double size );
/* /*
* Extension functions, see freeglut_ext.c * Extension functions, see fg_ext.c
*/ */
typedef void (*GLUTproc)(); typedef void (*GLUTproc)();
FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName ); 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 ) ); 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 !!!!! */ /* USE OF THESE FUNCTIONS IS DEPRECATED !!!!! */
/* If you have a serious need for these functions in your application, please either /* 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 ); 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 */ /* to get the typedef for va_list */
#include <stdarg.h> #include <stdarg.h>

View File

@ -417,12 +417,12 @@ FGAPI void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode );
FGAPI void FGAPIENTRY glutInitDisplayString( const char* 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 ); 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 glutCreateWindow( const char* title );
FGAPI int FGAPIENTRY glutCreateSubWindow( int window, int x, int y, int width, int height ); 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 ); 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 glutPostWindowRedisplay( int window );
FGAPI void FGAPIENTRY glutPostRedisplay( void ); FGAPI void FGAPIENTRY glutPostRedisplay( void );
FGAPI void FGAPIENTRY glutSwapBuffers( 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 glutWarpPointer( int x, int y );
FGAPI void FGAPIENTRY glutSetCursor( int cursor ); 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 glutEstablishOverlay( void );
FGAPI void FGAPIENTRY glutRemoveOverlay( void ); FGAPI void FGAPIENTRY glutRemoveOverlay( void );
@ -465,7 +465,7 @@ FGAPI void FGAPIENTRY glutShowOverlay( void );
FGAPI void FGAPIENTRY glutHideOverlay( 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 int FGAPIENTRY glutCreateMenu( void (* callback)( int menu ) );
FGAPI void FGAPIENTRY glutDestroyMenu( int menu ); FGAPI void FGAPIENTRY glutDestroyMenu( int menu );
@ -480,13 +480,13 @@ FGAPI void FGAPIENTRY glutAttachMenu( int button );
FGAPI void FGAPIENTRY glutDetachMenu( 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 glutTimerFunc( unsigned int time, void (* callback)( int ), int value );
FGAPI void FGAPIENTRY glutIdleFunc( void (* callback)( void ) ); 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 glutKeyboardFunc( void (* callback)( unsigned char, int, int ) );
FGAPI void FGAPIENTRY glutSpecialFunc( void (* callback)( int, 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 ) ); 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 glutGet( GLenum query );
FGAPI int FGAPIENTRY glutDeviceGet( GLenum query ); FGAPI int FGAPIENTRY glutDeviceGet( GLenum query );
@ -523,7 +523,7 @@ FGAPI int FGAPIENTRY glutGetModifiers( void );
FGAPI int FGAPIENTRY glutLayerGet( GLenum query ); 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 void FGAPIENTRY glutBitmapCharacter( void* font, int character );
FGAPI int FGAPIENTRY glutBitmapWidth( 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 ); 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 ); FGAPI void FGAPIENTRY glutWireCube( double size );
@ -554,14 +554,14 @@ FGAPI void FGAPIENTRY glutWireIcosahedron( void );
FGAPI void FGAPIENTRY glutSolidIcosahedron( 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 * NB: front facing polygons have clockwise winding, not counter clockwise
*/ */
FGAPI void FGAPIENTRY glutWireTeapot( double size ); FGAPI void FGAPIENTRY glutWireTeapot( double size );
FGAPI void FGAPIENTRY glutSolidTeapot( 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 void FGAPIENTRY glutGameModeString( const char* string );
FGAPI int FGAPIENTRY glutEnterGameMode( void ); FGAPI int FGAPIENTRY glutEnterGameMode( void );
@ -569,7 +569,7 @@ FGAPI void FGAPIENTRY glutLeaveGameMode( void );
FGAPI int FGAPIENTRY glutGameModeGet( GLenum query ); 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 int FGAPIENTRY glutVideoResizeGet( GLenum query );
FGAPI void FGAPIENTRY glutSetupVideoResizing( void ); 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 ); 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 void FGAPIENTRY glutSetColor( int color, GLfloat red, GLfloat green, GLfloat blue );
FGAPI GLfloat FGAPIENTRY glutGetColor( int color, int component ); FGAPI GLfloat FGAPIENTRY glutGetColor( int color, int component );
FGAPI void FGAPIENTRY glutCopyColormap( int window ); 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 glutIgnoreKeyRepeat( int ignore );
FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode );
FGAPI void FGAPIENTRY glutForceJoystickFunc( void ); 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 int FGAPIENTRY glutExtensionSupported( const char* extension );
FGAPI void FGAPIENTRY glutReportErrors( void ); FGAPI void FGAPIENTRY glutReportErrors( void );

View File

@ -32,7 +32,7 @@
#include "egl/fg_internal_egl.h" #include "egl/fg_internal_egl.h"
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ /* -- 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; typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
struct android_app; struct android_app;
struct tagSFG_PlatformDisplay struct tagSFG_PlatformDisplay
@ -68,7 +68,7 @@ struct touchscreen {
/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* -- 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 * interspersed
*/ */

View File

@ -54,7 +54,7 @@
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "FreeGLUT-jnicb", __VA_ARGS__)) #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__)) #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 int32_t handle_input(struct android_app* app, AInputEvent* event);
extern void handle_cmd(struct android_app* app, int32_t cmd); extern void handle_cmd(struct android_app* app, int32_t cmd);

View File

@ -37,7 +37,7 @@
#include <bps/navigator.h> #include <bps/navigator.h>
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ /* -- 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; typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
struct tagSFG_PlatformDisplay struct tagSFG_PlatformDisplay
{ {
@ -76,7 +76,7 @@ struct touchscreen {
/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* -- 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 * interspersed
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_display_android.c * fg_display_android.c
* *
* Display message posting, context buffer swapping. * Display message posting, context buffer swapping.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_internal_android.h * fg_internal_android.h
* *
* The freeglut library private include file. * The freeglut library private include file.
* *
@ -29,7 +29,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ /* -- 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_Window;
struct tagSFG_PlatformDisplayEGL struct tagSFG_PlatformDisplayEGL
{ {

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_display_android.c * fg_display_android.c
* *
* Window management methods for EGL * Window management methods for EGL
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_callbacks.c * fg_callbacks.c
* *
* The callbacks setting methods. * The callbacks setting methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_cursor.c * fg_cursor.c
* *
* The mouse cursor related stuff. * The mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_display.c * fg_display.c
* *
* Display message posting, context buffer swapping. * Display message posting, context buffer swapping.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_ext.c * fg_ext.c
* *
* Functions related to OpenGL extensions. * Functions related to OpenGL extensions.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_font.c * fg_font.c
* *
* Bitmap and stroke fonts displaying. * Bitmap and stroke fonts displaying.
* *
@ -37,7 +37,7 @@
/* -- IMPORT DECLARATIONS -------------------------------------------------- */ /* -- 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 fgFontFixed8x13;
extern SFG_Font fgFontFixed9x15; extern SFG_Font fgFontFixed9x15;

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_gamemode.c * fg_gamemode.c
* *
* The game mode handling code. * The game mode handling code.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_geometry.c * fg_geometry.c
* *
* Freeglut geometry rendering methods. * Freeglut geometry rendering methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_init.c * fg_init.c
* *
* Various freeglut initialization functions. * Various freeglut initialization functions.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_input_devices.c * fg_input_devices.c
* *
* Handles miscellaneous input devices via direct serial-port access. * Handles miscellaneous input devices via direct serial-port access.
* Proper X11 XInput device support is not yet supported. * Proper X11 XInput device support is not yet supported.

View File

@ -353,7 +353,7 @@ struct tagSFG_State
FGWarning WarningFunc; /* User defined warning handler */ 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; typedef struct tagSFG_Display SFG_Display;
struct tagSFG_Display struct tagSFG_Display
{ {
@ -791,7 +791,7 @@ struct tagSFG_StrokeFont
/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* -- 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 * interspersed
*/ */
@ -942,7 +942,7 @@ void fgDestroyStructure( void );
/* /*
* Window creation, opening, closing and destruction. * Window creation, opening, closing and destruction.
* Also CallBack clearing/initialization. * 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, SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
GLboolean positionUse, int x, int y, GLboolean positionUse, int x, int y,
@ -958,11 +958,11 @@ void fgAddToWindowDestroyList ( SFG_Window* window );
void fgCloseWindows (); void fgCloseWindows ();
void fgDestroyWindow( SFG_Window* window ); 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 ); SFG_Menu* fgCreateMenu( FGCBMenu menuCallback );
void fgDestroyMenu( SFG_Menu* menu ); 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 ); int fgJoystickDetect( void );
void fgInitialiseJoysticks( void ); void fgInitialiseJoysticks( void );
void fgJoystickClose( void ); void fgJoystickClose( void );
@ -973,7 +973,7 @@ int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void ); void fgInitialiseInputDevices( void );
void fgInputDeviceClose( void ); void fgInputDeviceClose( void );
/* spaceball device functions, defined in freeglut_spaceball.c */ /* spaceball device functions, defined in fg_spaceball.c */
void fgInitialiseSpaceball( void ); void fgInitialiseSpaceball( void );
void fgSpaceballClose( void ); void fgSpaceballClose( void );
void fgSpaceballSetWindow( SFG_Window *window ); 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 *), * where window is the enumerated (sub)window pointer (SFG_Window *),
* and userData is the a custom user-supplied pointer. Functions * 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 fgEnumWindows( FGCBWindowEnumerator enumCallback, SFG_Enumerator* enumerator );
void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback, 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 * fgWindowByHandle returns a (SFG_Window *) value pointing to the
* first window in the queue matching the specified window handle. * 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 ); SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow );
/* /*
* This function is similiar to the previous one, except it is * This function is similiar to the previous one, except it is
* looking for a specified (sub)window identifier. The function * 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 ); 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 * This function gets called just before the buffers swap, so that
* freeglut can display the pull-down menus via OpenGL. The function * 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 ); void fgDisplayMenu( void );

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_joystick.c * fg_joystick.c
* *
* Joystick handling code * Joystick handling code
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_main.c * fg_main.c
* *
* The windows message processing methods. * The windows message processing methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_menu.c * fg_menu.c
* *
* Pull-down menu creation and handling. * Pull-down menu creation and handling.
* *
@ -782,7 +782,7 @@ void fghCalculateMenuBoxSize( void )
*/ */
int FGAPIENTRY glutCreateMenu( FGCBMenu callback ) 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" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
if (fgState.ActiveMenus) if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use."); fgError("Menu manipulation not allowed while menus in use.");
@ -804,7 +804,7 @@ void FGAPIENTRY glutDestroyMenu( int menuID )
if (fgState.ActiveMenus) if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use."); 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 ); fgDestroyMenu( menu );
} }

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_misc.c * fg_misc.c
* *
* Functions that didn't fit anywhere else... * Functions that didn't fit anywhere else...
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_overlay.c * fg_overlay.c
* *
* Overlay management functions (as defined by GLUT API) * Overlay management functions (as defined by GLUT API)
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_state.c * fg_state.c
* *
* Freeglut state query methods. * Freeglut state query methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_stroke_mono_roman.c * fg_stroke_mono_roman.c
* *
* freeglut Monospace Roman stroke font definition * freeglut Monospace Roman stroke font definition
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_stroke_roman.c * fg_stroke_roman.c
* *
* freeglut Roman stroke font definition * freeglut Roman stroke font definition
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_structure.c * fg_structure.c
* *
* Windows and menus need tree structure * 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 * 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, fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode,
(GLboolean)(parent ? GL_TRUE : GL_FALSE) ); (GLboolean)(parent ? GL_TRUE : GL_FALSE) );
@ -190,7 +190,7 @@ void fgCloseWindows( )
/* /*
* This function destroys a window and all of its subwindows. Actually, * 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... * a whole different story...
*/ */
void fgDestroyWindow( SFG_Window* window ) void fgDestroyWindow( SFG_Window* window )
@ -465,7 +465,7 @@ static void fghcbWindowByHandle( SFG_Window *window,
/* /*
* fgWindowByHandle returns a (SFG_Window *) value pointing to the * fgWindowByHandle returns a (SFG_Window *) value pointing to the
* first window in the queue matching the specified window handle. * 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 ) 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 * This function is similar to the previous one, except it is
* looking for a specified (sub)window identifier. The function * 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 ) SFG_Window* fgWindowByID( int windowID )
{ {

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_teapot.c * fg_teapot.c
* *
* Teapot(tm) rendering code. * Teapot(tm) rendering code.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_teapot_data.h * fg_teapot_data.h
* *
* The freeglut library teapot data include file. * The freeglut library teapot data include file.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_videoresize.c * fg_videoresize.c
* *
* Video resize functions (as defined by GLUT API) * Video resize functions (as defined by GLUT API)
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_window.c * fg_window.c
* *
* Window management methods. * Window management methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_cursor_mswin.c * fg_cursor_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_display_mswin.c * fg_display_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_gamemode_mswin.c * fg_gamemode_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_init_mswin.c * fg_init_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *
@ -34,6 +34,7 @@
extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam ); WPARAM wParam, LPARAM lParam );
extern void fgPlatformInitSystemTime(); extern void fgPlatformInitSystemTime();
extern void fghCloseInputDevices(void);
/* /*
@ -138,8 +139,6 @@ void fgPlatformInitialize( const char* displayName )
/* Platform-Specific Deinitialization Functions: */ /* Platform-Specific Deinitialization Functions: */
extern void fghCloseInputDevices ( void );
void fgPlatformDeinitialiseInputDevices ( void ) void fgPlatformDeinitialiseInputDevices ( void )
{ {
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_input_devices_mswin.c * fg_input_devices_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_internal_mswin.h * fg_internal_mswin.h
* *
* The freeglut library private include file. * The freeglut library private include file.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_joystick_mswin.c * fg_joystick_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_main_mswin.c * fg_main_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_menu_mswin.c * fg_menu_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_spaceball_mswin.c * fg_spaceball_mswin.c
* *
* Spaceball support for Windows * Spaceball support for Windows
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_state_mswin.c * fg_state_mswin.c
* *
* The Windows-specific state query methods. * The Windows-specific state query methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_structure_mswin.c * fg_structure_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_window_mswin.c * fg_window_mswin.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_cursor_x11.c * fg_cursor_x11.c
* *
* The Windows-specific mouse cursor related stuff. * The Windows-specific mouse cursor related stuff.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_display_x11.c * fg_display_x11.c
* *
* Display message posting, context buffer swapping. * Display message posting, context buffer swapping.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_ext.c * fg_ext.c
* *
* Functions related to OpenGL extensions. * Functions related to OpenGL extensions.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_gamemode_x11.c * fg_gamemode_x11.c
* *
* The game mode handling code. * The game mode handling code.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_init_x11.c * fg_init_x11.c
* *
* Various freeglut initialization functions. * Various freeglut initialization functions.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_input_devices_x11.c * fg_input_devices_x11.c
* *
* Handles miscellaneous input devices via direct serial-port access. * Handles miscellaneous input devices via direct serial-port access.
* Proper X11 XInput device support is not yet supported. * Proper X11 XInput device support is not yet supported.

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_internal_x11.h * fg_internal_x11.h
* *
* The freeglut library private include file. * The freeglut library private include file.
* *
@ -49,7 +49,7 @@
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ /* -- 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; typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
struct tagSFG_PlatformDisplay struct tagSFG_PlatformDisplay
{ {
@ -122,7 +122,7 @@ struct tagSFG_PlatformWindowState
/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* -- 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 * interspersed
*/ */
# ifdef HAVE_SYS_IOCTL_H # ifdef HAVE_SYS_IOCTL_H
@ -220,12 +220,12 @@ struct tagSFG_PlatformJoystick
/* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */ /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */
/* spaceball device functions, defined in freeglut_spaceball.c */ /* spaceball device functions, defined in fg_spaceball.c */
int fgIsSpaceballXEvent( const XEvent *ev ); int fgIsSpaceballXEvent( const XEvent *ev );
void fgSpaceballHandleXEvent( 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); int fgHintPresent(Window window, Atom property, Atom hint);

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_internal_x11.h * fg_internal_x11.h
* *
* The freeglut library private include file. * The freeglut library private include file.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_joystick_x11.c * fg_joystick_x11.c
* *
* Joystick handling code * Joystick handling code
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_main_x11.c * fg_main_x11.c
* *
* The X11-specific windows message processing methods. * The X11-specific windows message processing methods.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_menu_x11.c * fg_menu_x11.c
* *
* Pull-down menu creation and handling. * Pull-down menu creation and handling.
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_state_x11.c * fg_state_x11.c
* *
* X11-specific freeglut state query methods. * 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. * 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 * 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. * checking for a wheel event.
*/ */
{ {

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_structure.c * fg_structure.c
* *
* Windows and menus need tree structure * Windows and menus need tree structure
* *

View File

@ -1,5 +1,5 @@
/* /*
* freeglut_window_x11.c * fg_window_x11.c
* *
* Window management methods for X11 * Window management methods for X11
* *

View File

@ -16,7 +16,7 @@
/* convert the XInput button state mask to the regular X mouse event button mask */ /* convert the XInput button state mask to the regular X mouse event button mask */
#define BUTTON_MASK(xistate) ((xistate) << 8) #define BUTTON_MASK(xistate) ((xistate) << 8)
/* import function from freeglut_main.c */ /* import function from fg_main.c */
extern int fgPlatformGetModifiers( int state ); extern int fgPlatformGetModifiers( int state );
/* extension opcode for XInput */ /* extension opcode for XInput */