projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Joe Krahn\'s input (dials) device implementation.
[freeglut]
/
src
/
freeglut_internal.h
diff --git
a/src/freeglut_internal.h
b/src/freeglut_internal.h
index
9f18d04
..
185f9a4
100644
(file)
--- a/
src/freeglut_internal.h
+++ b/
src/freeglut_internal.h
@@
-34,7
+34,7
@@
/* XXX Update these for each release! */
#define VERSION_MAJOR 2
/* XXX Update these for each release! */
#define VERSION_MAJOR 2
-#define VERSION_MINOR 2
+#define VERSION_MINOR 4
#define VERSION_PATCH 0
/* Freeglut is meant to be available under all Unix/X11 and Win32 platforms. */
#define VERSION_PATCH 0
/* Freeglut is meant to be available under all Unix/X11 and Win32 platforms. */
@@
-244,6
+244,7
@@
struct tagSFG_State
fgExecutionState ExecState; /* Used for GLUT termination */
char *ProgramName; /* Name of the invoking program */
GLboolean JoysticksInitialised; /* Only initialize if application calls for them */
fgExecutionState ExecState; /* Used for GLUT termination */
char *ProgramName; /* Name of the invoking program */
GLboolean JoysticksInitialised; /* Only initialize if application calls for them */
+ GLboolean InputDevsInitialised; /* Only initialize if application calls for them */
};
/* The structure used by display initialization in freeglut_init.c */
};
/* The structure used by display initialization in freeglut_init.c */
@@
-772,6
+773,11
@@
int glutJoystickGetNumAxes( int ident );
int glutJoystickGetNumButtons( int ident );
int glutJoystickNotWorking( int ident );
int glutJoystickGetNumButtons( int ident );
int glutJoystickNotWorking( int ident );
+/* InputDevice Init/Fini */
+int fgInputDeviceDetect( void );
+void fgInitialiseInputDevices( void );
+void fgInputDeviceClose( void );
+
/* Setting the cursor for a given window */
void fgSetCursor ( SFG_Window *window, int cursorID );
/* Setting the cursor for a given window */
void fgSetCursor ( SFG_Window *window, int cursorID );