projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved static variables and functions that should not have stuck behind in fg_joystick...
[freeglut]
/
src
/
x11
/
fg_internal_x11.h
diff --git
a/src/x11/fg_internal_x11.h
b/src/x11/fg_internal_x11.h
index
9919ae5
..
09a238a
100644
(file)
--- 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.
*
*
* 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;
struct tagSFG_PlatformDisplay
{
typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
struct tagSFG_PlatformDisplay
{
@@
-60,6
+60,9
@@
struct tagSFG_PlatformDisplay
Atom DeleteWindow; /* The window deletion atom */
Atom State; /* The state atom */
Atom StateFullScreen; /* The full screen atom */
Atom DeleteWindow; /* The window deletion atom */
Atom State; /* The state atom */
Atom StateFullScreen; /* The full screen atom */
+ int NetWMSupported; /* Flag for EWMH Window Managers */
+ Atom NetWMPid; /* The _NET_WM_PID atom */
+ Atom ClientMachine; /* The client machine name atom */
#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
int prev_xsz, prev_ysz;
#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
int prev_xsz, prev_ysz;
@@
-113,12
+116,13
@@
struct tagSFG_PlatformWindowState
{
int OldWidth; /* Window width from before a resize */
int OldHeight; /* " height " " " " */
{
int OldWidth; /* Window width from before a resize */
int OldHeight; /* " height " " " " */
+ GLboolean KeyRepeating; /* Currently in repeat mode? */
};
/* -- 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
*/
# ifdef HAVE_SYS_IOCTL_H
* interspersed
*/
# ifdef HAVE_SYS_IOCTL_H
@@
-127,10
+131,10
@@
struct tagSFG_PlatformWindowState
# ifdef HAVE_FCNTL_H
# include <fcntl.h>
# endif
# ifdef HAVE_FCNTL_H
# include <fcntl.h>
# endif
-# ifdef HAVE_ERRNO_H
-# include <errno.h>
-# include <string.h>
-# endif
+
+#include <errno.h>
+#include <string.h>
+
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
@@
-216,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 );
void fgSpaceballHandleXEvent( const XEvent *ev );
/*
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);
*/
int fgHintPresent(Window window, Atom property, Atom hint);