Internal header cleanup.

This commit is contained in:
Camilla Berglund
2014-09-02 19:42:43 +02:00
parent c85294e0b2
commit f8d80a936f
17 changed files with 113 additions and 229 deletions
+12 -33
View File
@@ -72,22 +72,14 @@
#define _GLFW_PLATFORM_CURSOR_STATE _GLFWcursorX11 x11
//========================================================================
// GLFW platform specific types
//========================================================================
//------------------------------------------------------------------------
// Platform-specific window structure
//------------------------------------------------------------------------
// X11-specific per-window data
//
typedef struct _GLFWwindowX11
{
// Platform specific window resources
Colormap colormap; // Window colormap
Window handle; // Window handle
Colormap colormap;
Window handle;
// Various platform specific internal variables
GLboolean overrideRedirect; // True if window is OverrideRedirect
GLboolean overrideRedirect;
// Cached position and size used to filter out duplicate events
int width, height;
@@ -101,9 +93,8 @@ typedef struct _GLFWwindowX11
} _GLFWwindowX11;
//------------------------------------------------------------------------
// Platform-specific library global data for X11
//------------------------------------------------------------------------
// X11-specific global data
//
typedef struct _GLFWlibraryX11
{
Display* display;
@@ -214,9 +205,8 @@ typedef struct _GLFWlibraryX11
} _GLFWlibraryX11;
//------------------------------------------------------------------------
// Platform-specific monitor structure
//------------------------------------------------------------------------
// X11-specific per-monitor data
//
typedef struct _GLFWmonitorX11
{
RROutput output;
@@ -226,41 +216,30 @@ typedef struct _GLFWmonitorX11
} _GLFWmonitorX11;
//------------------------------------------------------------------------
// Platform-specific cursor structure
//------------------------------------------------------------------------
// X11-specific per-cursor data
//
typedef struct _GLFWcursorX11
{
Cursor handle;
} _GLFWcursorX11;
//========================================================================
// Prototypes for platform specific internal functions
//========================================================================
// Gamma
void _glfwInitGammaRamp(void);
// Fullscreen support
GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* desired);
void _glfwRestoreVideoMode(_GLFWmonitor* monitor);
// Clipboard handling
void _glfwHandleSelectionClear(XEvent* event);
void _glfwHandleSelectionRequest(XEvent* event);
void _glfwPushSelectionToManager(_GLFWwindow* window);
Cursor _glfwCreateCursor(const GLFWimage* image, int xhot, int yhot);
// Window support
_GLFWwindow* _glfwFindWindowByHandle(Window handle);
unsigned long _glfwGetWindowProperty(Window window,
Atom property,
Atom type,
unsigned char** value);
// X11 error handler
void _glfwGrabXErrorHandler(void);
void _glfwReleaseXErrorHandler(void);
void _glfwInputXError(int error, const char* message);