edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated to glfw-1.6 and merged previous modifications

Browse source
This commit is contained in:
Dominik Geyer 2008-10-16 17:09:34 +00:00
parent 07fc7ec8f8
commit 977785b154
6 changed files with 177 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

242
src/engine/external/glfw/include/GL/glfw.h vendored
View file

@ -1,31 +1,31 @@
/*======================================================================== */ /*======================================================================== */
/* GLFW - An OpenGL framework */ /* GLFW - An OpenGL framework */
/* File: glfw.h */ /* File: glfw.h */
/* API version: 2.6 */ /* API version: 2.6 */
/* WWW: http://glfw.sourceforge.net */ /* WWW: http://glfw.sourceforge.net */
/*------------------------------------------------------------------------ */ /*------------------------------------------------------------------------ */
/* Copyright (c) 2002-2006 Camilla Berglund */ /* Copyright (c) 2002-2006 Camilla Berglund */
/* */ /* */
/* This software is provided 'as-is', without any express or implied */ /* This software is provided 'as-is', without any express or implied */
/* warranty. In no event will the authors be held liable for any damages */ /* warranty. In no event will the authors be held liable for any damages */
/* arising from the use of this software. */ /* arising from the use of this software. */
/* */ /* */
/* Permission is granted to anyone to use this software for any purpose, */ /* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */ /* including commercial applications, and to alter it and redistribute it */
/* freely, subject to the following restrictions: */ /* freely, subject to the following restrictions: */
/* */ /* */
/* 1. The origin of this software must not be misrepresented; you must not */ /* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */ /* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would */ /* in a product, an acknowledgment in the product documentation would */
/* be appreciated but is not required. */ /* be appreciated but is not required. */
/* */ /* */
/* 2. Altered source versions must be plainly marked as such, and must not */ /* 2. Altered source versions must be plainly marked as such, and must not */
/* be misrepresented as being the original software. */ /* be misrepresented as being the original software. */
/* */ /* */
/* 3. This notice may not be removed or altered from any source */ /* 3. This notice may not be removed or altered from any source */
/* distribution. */ /* distribution. */
/* */ /* */
/*======================================================================== */ /*======================================================================== */
#ifndef __glfw_h_ #ifndef __glfw_h_
#define __glfw_h_ #define __glfw_h_
@ -35,38 +35,38 @@ extern "C" {
#endif #endif
/*======================================================================== */ /*======================================================================== */
/* Global definitions */ /* Global definitions */
/*======================================================================== */ /*======================================================================== */
/* We need a NULL pointer from time to time */ /* We need a NULL pointer from time to time */
#ifndef NULL #ifndef NULL
#ifdef __cplusplus #ifdef __cplusplus
#define NULL 0 #define NULL 0
#else #else
#define NULL ((void *)0) #define NULL ((void *)0)
#endif #endif
#endif /* NULL */ #endif /* NULL */
/* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */ /* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */
/* Please report any probles that you find with your compiler, which may */ /* Please report any probles that you find with your compiler, which may */
/* be solved in this section! There are several compilers that I have not */ /* be solved in this section! There are several compilers that I have not */
/* been able to test this file with yet. */ /* been able to test this file with yet. */
/* First: If we are we on Windows, we want a single define for it (_WIN32) */ /* First: If we are we on Windows, we want a single define for it (_WIN32) */
/* (Note: For Cygwin the compiler flag -mwin32 should be used, but to */ /* (Note: For Cygwin the compiler flag -mwin32 should be used, but to */
/* make sure that things run smoothly for Cygwin users, we add __CYGWIN__ */ /* make sure that things run smoothly for Cygwin users, we add __CYGWIN__ */
/* to the list of "valid Win32 identifiers", which removes the need for */ /* to the list of "valid Win32 identifiers", which removes the need for */
/* -mwin32) */ /* -mwin32) */
#if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__)) #if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))
#define _WIN32 #define _WIN32
#endif /* _WIN32 */ #endif /* _WIN32 */
/* In order for extension support to be portable, we need to define an */ /* In order for extension support to be portable, we need to define an */
/* OpenGL function call method. We use the keyword APIENTRY, which is */ /* OpenGL function call method. We use the keyword APIENTRY, which is */
/* defined for Win32. (Note: Windows also needs this for <GL/gl.h>) */ /* defined for Win32. (Note: Windows also needs this for <GL/gl.h>) */
#ifndef APIENTRY #ifndef APIENTRY
#ifdef _WIN32 #ifdef _WIN32
#define APIENTRY __stdcall #define APIENTRY __stdcall
@ -74,63 +74,63 @@ extern "C" {
#define APIENTRY #define APIENTRY
#endif #endif
#define GL_APIENTRY_DEFINED #define GL_APIENTRY_DEFINED
#endif /* APIENTRY */ #endif /* APIENTRY */
/* The following three defines are here solely to make some Windows-based */ /* The following three defines are here solely to make some Windows-based */
/* <GL/gl.h> files happy. Theoretically we could include <windows.h>, but */ /* <GL/gl.h> files happy. Theoretically we could include <windows.h>, but */
/* it has the major drawback of severely polluting our namespace. */ /* it has the major drawback of severely polluting our namespace. */
/* Under Windows, we need WINGDIAPI defined */ /* Under Windows, we need WINGDIAPI defined */
#if !defined(WINGDIAPI) && defined(_WIN32) #if !defined(WINGDIAPI) && defined(_WIN32)
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__) #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)
/* Microsoft Visual C++, Borland C++ Builder and Pelles C */ /* Microsoft Visual C++, Borland C++ Builder and Pelles C */
#define WINGDIAPI __declspec(dllimport) #define WINGDIAPI __declspec(dllimport)
#elif defined(__LCC__) #elif defined(__LCC__)
/* LCC-Win32 */ /* LCC-Win32 */
#define WINGDIAPI __stdcall #define WINGDIAPI __stdcall
#else #else
/* Others (e.g. MinGW, Cygwin) */ /* Others (e.g. MinGW, Cygwin) */
#define WINGDIAPI extern #define WINGDIAPI extern
#endif #endif
#define GL_WINGDIAPI_DEFINED #define GL_WINGDIAPI_DEFINED
#endif /* WINGDIAPI */ #endif /* WINGDIAPI */
/* Some <GL/glu.h> files also need CALLBACK defined */ /* Some <GL/glu.h> files also need CALLBACK defined */
#if !defined(CALLBACK) && defined(_WIN32) #if !defined(CALLBACK) && defined(_WIN32)
#if defined(_MSC_VER) #if defined(_MSC_VER)
/* Microsoft Visual C++ */ /* Microsoft Visual C++ */
#if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
#define CALLBACK __stdcall #define CALLBACK __stdcall
#else #else
#define CALLBACK #define CALLBACK
#endif #endif
#else #else
/* Other Windows compilers */ /* Other Windows compilers */
#define CALLBACK __stdcall #define CALLBACK __stdcall
#endif #endif
#define GLU_CALLBACK_DEFINED #define GLU_CALLBACK_DEFINED
#endif /* CALLBACK */ #endif /* CALLBACK */
/* Microsoft Visual C++, Borland C++ and Pelles C <GL/glu.h> needs wchar_t */ /* Microsoft Visual C++, Borland C++ and Pelles C <GL/glu.h> needs wchar_t */
#if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)) && !defined(_WCHAR_T_DEFINED) #if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)) && !defined(_WCHAR_T_DEFINED)
typedef unsigned short wchar_t; typedef unsigned short wchar_t;
#define _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED
#endif /* _WCHAR_T_DEFINED */ #endif /* _WCHAR_T_DEFINED */
/* ---------------- GLFW related system specific defines ----------------- */ /* ---------------- GLFW related system specific defines ----------------- */
#if defined(_WIN32) && defined(GLFW_BUILD_DLL) #if defined(_WIN32) && defined(GLFW_BUILD_DLL)
/* We are building a Win32 DLL */ /* We are building a Win32 DLL */
#define GLFWAPI __declspec(dllexport) #define GLFWAPI __declspec(dllexport)
#define GLFWAPIENTRY __stdcall #define GLFWAPIENTRY __stdcall
#define GLFWCALL __stdcall #define GLFWCALL __stdcall
#elif defined(_WIN32) && defined(GLFW_DLL) #elif defined(_WIN32) && defined(GLFW_DLL)
/* We are calling a Win32 DLL */ /* We are calling a Win32 DLL */
#if defined(__LCC__) #if defined(__LCC__)
#define GLFWAPI extern #define GLFWAPI extern
#else #else
@ -141,20 +141,20 @@ extern "C" {
#else #else
/* We are either building/calling a static lib or we are non-win32 */ /* We are either building/calling a static lib or we are non-win32 */
#define GLFWAPIENTRY #define GLFWAPIENTRY
#define GLFWAPI #define GLFWAPI
#define GLFWCALL #define GLFWCALL
#endif #endif
/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */ /* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */
/* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is */ /* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is */
/* convenient for the user to only have to include <GL/glfw.h>. This also */ /* convenient for the user to only have to include <GL/glfw.h>. This also */
/* solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some */ /* solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some */
/* special defines which normally requires the user to include <windows.h> */ /* special defines which normally requires the user to include <windows.h> */
/* (which is not a nice solution for portable programs). */ /* (which is not a nice solution for portable programs). */
#if defined(__APPLE_CC__) #if defined(__APPLE_CC__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
@ -164,26 +164,26 @@ extern "C" {
#endif #endif
/*======================================================================== */ /*======================================================================== */
/* GLFW version */ /* GLFW version */
/*======================================================================== */ /*======================================================================== */
#define GLFW_VERSION_MAJOR 2 #define GLFW_VERSION_MAJOR 2
#define GLFW_VERSION_MINOR 6 #define GLFW_VERSION_MINOR 6
#define GLFW_VERSION_REVISION 0 #define GLFW_VERSION_REVISION 0
/*======================================================================== */ /*======================================================================== */
/* Input handling definitions */ /* Input handling definitions */
/*======================================================================== */ /*======================================================================== */
/* Key and button state/action definitions */ /* Key and button state/action definitions */
#define GLFW_RELEASE 0 #define GLFW_RELEASE 0
#define GLFW_PRESS 1 #define GLFW_PRESS 1
/* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used */ /* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used */
/* for printable keys (such as A-Z, 0-9 etc), and values above 256 */ /* for printable keys (such as A-Z, 0-9 etc), and values above 256 */
/* represent special (non-printable) keys (e.g. F1, Page Up etc). */ /* represent special (non-printable) keys (e.g. F1, Page Up etc). */
#define GLFW_KEY_UNKNOWN -1 #define GLFW_KEY_UNKNOWN -1
#define GLFW_KEY_SPACE 32 #define GLFW_KEY_SPACE 32
#define GLFW_KEY_SPECIAL 256 #define GLFW_KEY_SPECIAL 256
@ -251,7 +251,7 @@ extern "C" {
#define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL+62) #define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL+62)
#define GLFW_KEY_LAST GLFW_KEY_KP_ENTER #define GLFW_KEY_LAST GLFW_KEY_KP_ENTER
/* Mouse button definitions */ /* Mouse button definitions */
#define GLFW_MOUSE_BUTTON_1 0 #define GLFW_MOUSE_BUTTON_1 0
#define GLFW_MOUSE_BUTTON_2 1 #define GLFW_MOUSE_BUTTON_2 1
#define GLFW_MOUSE_BUTTON_3 2 #define GLFW_MOUSE_BUTTON_3 2
@ -262,13 +262,13 @@ extern "C" {
#define GLFW_MOUSE_BUTTON_8 7 #define GLFW_MOUSE_BUTTON_8 7
#define GLFW_MOUSE_BUTTON_LAST GLFW_MOUSE_BUTTON_8 #define GLFW_MOUSE_BUTTON_LAST GLFW_MOUSE_BUTTON_8
/* Mouse button aliases */ /* Mouse button aliases */
#define GLFW_MOUSE_BUTTON_LEFT GLFW_MOUSE_BUTTON_1 #define GLFW_MOUSE_BUTTON_LEFT GLFW_MOUSE_BUTTON_1
#define GLFW_MOUSE_BUTTON_RIGHT GLFW_MOUSE_BUTTON_2 #define GLFW_MOUSE_BUTTON_RIGHT GLFW_MOUSE_BUTTON_2
#define GLFW_MOUSE_BUTTON_MIDDLE GLFW_MOUSE_BUTTON_3 #define GLFW_MOUSE_BUTTON_MIDDLE GLFW_MOUSE_BUTTON_3
/* Joystick identifiers */ /* Joystick identifiers */
#define GLFW_JOYSTICK_1 0 #define GLFW_JOYSTICK_1 0
#define GLFW_JOYSTICK_2 1 #define GLFW_JOYSTICK_2 1
#define GLFW_JOYSTICK_3 2 #define GLFW_JOYSTICK_3 2
@ -288,15 +288,15 @@ extern "C" {
#define GLFW_JOYSTICK_LAST GLFW_JOYSTICK_16 #define GLFW_JOYSTICK_LAST GLFW_JOYSTICK_16
/*======================================================================== */ /*======================================================================== */
/* Other definitions */ /* Other definitions */
/*======================================================================== */ /*======================================================================== */
/* glfwOpenWindow modes */ /* glfwOpenWindow modes */
#define GLFW_WINDOW 0x00010001 #define GLFW_WINDOW 0x00010001
#define GLFW_FULLSCREEN 0x00010002 #define GLFW_FULLSCREEN 0x00010002
/* glfwGetWindowParam tokens */ /* glfwGetWindowParam tokens */
#define GLFW_OPENED 0x00020001 #define GLFW_OPENED 0x00020001
#define GLFW_ACTIVE 0x00020002 #define GLFW_ACTIVE 0x00020002
#define GLFW_ICONIFIED 0x00020003 #define GLFW_ICONIFIED 0x00020003
@ -308,8 +308,8 @@ extern "C" {
#define GLFW_DEPTH_BITS 0x00020009 #define GLFW_DEPTH_BITS 0x00020009
#define GLFW_STENCIL_BITS 0x0002000A #define GLFW_STENCIL_BITS 0x0002000A
/* The following constants are used for both glfwGetWindowParam */ /* The following constants are used for both glfwGetWindowParam */
/* and glfwOpenWindowHint */ /* and glfwOpenWindowHint */
#define GLFW_REFRESH_RATE 0x0002000B #define GLFW_REFRESH_RATE 0x0002000B
#define GLFW_ACCUM_RED_BITS 0x0002000C #define GLFW_ACCUM_RED_BITS 0x0002000C
#define GLFW_ACCUM_GREEN_BITS 0x0002000D #define GLFW_ACCUM_GREEN_BITS 0x0002000D
@ -320,7 +320,7 @@ extern "C" {
#define GLFW_WINDOW_NO_RESIZE 0x00020012 #define GLFW_WINDOW_NO_RESIZE 0x00020012
#define GLFW_FSAA_SAMPLES 0x00020013 #define GLFW_FSAA_SAMPLES 0x00020013
/* glfwEnable/glfwDisable tokens */ /* glfwEnable/glfwDisable tokens */
#define GLFW_MOUSE_CURSOR 0x00030001 #define GLFW_MOUSE_CURSOR 0x00030001
#define GLFW_STICKY_KEYS 0x00030002 #define GLFW_STICKY_KEYS 0x00030002
#define GLFW_STICKY_MOUSE_BUTTONS 0x00030003 #define GLFW_STICKY_MOUSE_BUTTONS 0x00030003
@ -328,36 +328,36 @@ extern "C" {
#define GLFW_KEY_REPEAT 0x00030005 #define GLFW_KEY_REPEAT 0x00030005
#define GLFW_AUTO_POLL_EVENTS 0x00030006 #define GLFW_AUTO_POLL_EVENTS 0x00030006
/* glfwWaitThread wait modes */ /* glfwWaitThread wait modes */
#define GLFW_WAIT 0x00040001 #define GLFW_WAIT 0x00040001
#define GLFW_NOWAIT 0x00040002 #define GLFW_NOWAIT 0x00040002
/* glfwGetJoystickParam tokens */ /* glfwGetJoystickParam tokens */
#define GLFW_PRESENT 0x00050001 #define GLFW_PRESENT 0x00050001
#define GLFW_AXES 0x00050002 #define GLFW_AXES 0x00050002
#define GLFW_BUTTONS 0x00050003 #define GLFW_BUTTONS 0x00050003
/* glfwReadImage/glfwLoadTexture2D flags */ /* glfwReadImage/glfwLoadTexture2D flags */
#define GLFW_NO_RESCALE_BIT 0x00000001 /* Only for glfwReadImage */ #define GLFW_NO_RESCALE_BIT 0x00000001 /* Only for glfwReadImage */
#define GLFW_ORIGIN_UL_BIT 0x00000002 #define GLFW_ORIGIN_UL_BIT 0x00000002
#define GLFW_BUILD_MIPMAPS_BIT 0x00000004 /* Only for glfwLoadTexture2D */ #define GLFW_BUILD_MIPMAPS_BIT 0x00000004 /* Only for glfwLoadTexture2D */
#define GLFW_ALPHA_MAP_BIT 0x00000008 #define GLFW_ALPHA_MAP_BIT 0x00000008
/* Time spans longer than this (seconds) are considered to be infinity */ /* Time spans longer than this (seconds) are considered to be infinity */
#define GLFW_INFINITY 100000.0 #define GLFW_INFINITY 100000.0
/*======================================================================== */ /*======================================================================== */
/* Typedefs */ /* Typedefs */
/*======================================================================== */ /*======================================================================== */
/* The video mode structure used by glfwGetVideoModes() */ /* The video mode structure used by glfwGetVideoModes() */
typedef struct { typedef struct {
int Width, Height; int Width, Height;
int RedBits, BlueBits, GreenBits; int RedBits, BlueBits, GreenBits;
} GLFWvidmode; } GLFWvidmode;
/* Image/texture information */ /* Image/texture information */
typedef struct { typedef struct {
int Width, Height; int Width, Height;
int Format; int Format;
@ -365,16 +365,16 @@ typedef struct {
unsigned char *Data; unsigned char *Data;
} GLFWimage; } GLFWimage;
/* Thread ID */ /* Thread ID */
typedef int GLFWthread; typedef int GLFWthread;
/* Mutex object */ /* Mutex object */
typedef void * GLFWmutex; typedef void * GLFWmutex;
/* Condition variable object */ /* Condition variable object */
typedef void * GLFWcond; typedef void * GLFWcond;
/* Function pointer types */ /* Function pointer types */
typedef void (GLFWCALL * GLFWwindowsizefun)(int,int); typedef void (GLFWCALL * GLFWwindowsizefun)(int,int);
typedef int (GLFWCALL * GLFWwindowclosefun)(void); typedef int (GLFWCALL * GLFWwindowclosefun)(void);
typedef void (GLFWCALL * GLFWwindowrefreshfun)(void); typedef void (GLFWCALL * GLFWwindowrefreshfun)(void);
@ -386,20 +386,20 @@ typedef void (GLFWCALL * GLFWcharfun)(int,int);
typedef void (GLFWCALL * GLFWthreadfun)(void *); typedef void (GLFWCALL * GLFWthreadfun)(void *);
/*======================================================================== */ /*======================================================================== */
/* Prototypes */ /* Prototypes */
/*======================================================================== */ /*======================================================================== */
/*! @file glfw.h /*! @file glfw.h
*/ */
/* GLFW initialization, termination and version querying */ /* GLFW initialization, termination and version querying */
/*! @fn glfwInit /*! @fn glfwInit
*/ */
GLFWAPI int GLFWAPIENTRY glfwInit( void ); GLFWAPI int GLFWAPIENTRY glfwInit( void );
GLFWAPI void GLFWAPIENTRY glfwTerminate( void ); GLFWAPI void GLFWAPIENTRY glfwTerminate( void );
GLFWAPI void GLFWAPIENTRY glfwGetVersion( int *major, int *minor, int *rev ); GLFWAPI void GLFWAPIENTRY glfwGetVersion( int *major, int *minor, int *rev );
/* Window handling */ /* Window handling */
GLFWAPI int GLFWAPIENTRY glfwOpenWindow( int width, int height, int redbits, int greenbits, int bluebits, int alphabits, int depthbits, int stencilbits, int mode ); GLFWAPI int GLFWAPIENTRY glfwOpenWindow( int width, int height, int redbits, int greenbits, int bluebits, int alphabits, int depthbits, int stencilbits, int mode );
GLFWAPI void GLFWAPIENTRY glfwOpenWindowHint( int target, int hint ); GLFWAPI void GLFWAPIENTRY glfwOpenWindowHint( int target, int hint );
GLFWAPI void GLFWAPIENTRY glfwCloseWindow( void ); GLFWAPI void GLFWAPIENTRY glfwCloseWindow( void );
@ -416,11 +416,11 @@ GLFWAPI void GLFWAPIENTRY glfwSetWindowSizeCallback( GLFWwindowsizefun cbfun );
GLFWAPI void GLFWAPIENTRY glfwSetWindowCloseCallback( GLFWwindowclosefun cbfun ); GLFWAPI void GLFWAPIENTRY glfwSetWindowCloseCallback( GLFWwindowclosefun cbfun );
GLFWAPI void GLFWAPIENTRY glfwSetWindowRefreshCallback( GLFWwindowrefreshfun cbfun ); GLFWAPI void GLFWAPIENTRY glfwSetWindowRefreshCallback( GLFWwindowrefreshfun cbfun );
/* Video mode functions */ /* Video mode functions */
GLFWAPI int GLFWAPIENTRY glfwGetVideoModes( GLFWvidmode *list, int maxcount ); GLFWAPI int GLFWAPIENTRY glfwGetVideoModes( GLFWvidmode *list, int maxcount );
GLFWAPI void GLFWAPIENTRY glfwGetDesktopMode( GLFWvidmode *mode ); GLFWAPI void GLFWAPIENTRY glfwGetDesktopMode( GLFWvidmode *mode );
/* Input handling */ /* Input handling */
GLFWAPI void GLFWAPIENTRY glfwPollEvents( void ); GLFWAPI void GLFWAPIENTRY glfwPollEvents( void );
GLFWAPI void GLFWAPIENTRY glfwWaitEvents( void ); GLFWAPI void GLFWAPIENTRY glfwWaitEvents( void );
GLFWAPI int GLFWAPIENTRY glfwGetKey( int key ); GLFWAPI int GLFWAPIENTRY glfwGetKey( int key );
@ -435,22 +435,22 @@ GLFWAPI void GLFWAPIENTRY glfwSetMouseButtonCallback( GLFWmousebuttonfun cbfun )
GLFWAPI void GLFWAPIENTRY glfwSetMousePosCallback( GLFWmouseposfun cbfun ); GLFWAPI void GLFWAPIENTRY glfwSetMousePosCallback( GLFWmouseposfun cbfun );
GLFWAPI void GLFWAPIENTRY glfwSetMouseWheelCallback( GLFWmousewheelfun cbfun ); GLFWAPI void GLFWAPIENTRY glfwSetMouseWheelCallback( GLFWmousewheelfun cbfun );
/* Joystick input */ /* Joystick input */
GLFWAPI int GLFWAPIENTRY glfwGetJoystickParam( int joy, int param ); GLFWAPI int GLFWAPIENTRY glfwGetJoystickParam( int joy, int param );
GLFWAPI int GLFWAPIENTRY glfwGetJoystickPos( int joy, float *pos, int numaxes ); GLFWAPI int GLFWAPIENTRY glfwGetJoystickPos( int joy, float *pos, int numaxes );
GLFWAPI int GLFWAPIENTRY glfwGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons ); GLFWAPI int GLFWAPIENTRY glfwGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons );
/* Time */ /* Time */
GLFWAPI double GLFWAPIENTRY glfwGetTime( void ); GLFWAPI double GLFWAPIENTRY glfwGetTime( void );
GLFWAPI void GLFWAPIENTRY glfwSetTime( double time ); GLFWAPI void GLFWAPIENTRY glfwSetTime( double time );
GLFWAPI void GLFWAPIENTRY glfwSleep( double time ); GLFWAPI void GLFWAPIENTRY glfwSleep( double time );
/* Extension support */ /* Extension support */
GLFWAPI int GLFWAPIENTRY glfwExtensionSupported( const char *extension ); GLFWAPI int GLFWAPIENTRY glfwExtensionSupported( const char *extension );
GLFWAPI void* GLFWAPIENTRY glfwGetProcAddress( const char *procname ); GLFWAPI void* GLFWAPIENTRY glfwGetProcAddress( const char *procname );
GLFWAPI void GLFWAPIENTRY glfwGetGLVersion( int *major, int *minor, int *rev ); GLFWAPI void GLFWAPIENTRY glfwGetGLVersion( int *major, int *minor, int *rev );
/* Threading support */ /* Threading support */
GLFWAPI GLFWthread GLFWAPIENTRY glfwCreateThread( GLFWthreadfun fun, void *arg ); GLFWAPI GLFWthread GLFWAPIENTRY glfwCreateThread( GLFWthreadfun fun, void *arg );
GLFWAPI void GLFWAPIENTRY glfwDestroyThread( GLFWthread ID ); GLFWAPI void GLFWAPIENTRY glfwDestroyThread( GLFWthread ID );
GLFWAPI int GLFWAPIENTRY glfwWaitThread( GLFWthread ID, int waitmode ); GLFWAPI int GLFWAPIENTRY glfwWaitThread( GLFWthread ID, int waitmode );
@ -466,11 +466,11 @@ GLFWAPI void GLFWAPIENTRY glfwSignalCond( GLFWcond cond );
GLFWAPI void GLFWAPIENTRY glfwBroadcastCond( GLFWcond cond ); GLFWAPI void GLFWAPIENTRY glfwBroadcastCond( GLFWcond cond );
GLFWAPI int GLFWAPIENTRY glfwGetNumberOfProcessors( void ); GLFWAPI int GLFWAPIENTRY glfwGetNumberOfProcessors( void );
/* Enable/disable functions */ /* Enable/disable functions */
GLFWAPI void GLFWAPIENTRY glfwEnable( int token ); GLFWAPI void GLFWAPIENTRY glfwEnable( int token );
GLFWAPI void GLFWAPIENTRY glfwDisable( int token ); GLFWAPI void GLFWAPIENTRY glfwDisable( int token );
/* Image/texture I/O support */ /* Image/texture I/O support */
GLFWAPI int GLFWAPIENTRY glfwReadImage( const char *name, GLFWimage *img, int flags ); GLFWAPI int GLFWAPIENTRY glfwReadImage( const char *name, GLFWimage *img, int flags );
GLFWAPI int GLFWAPIENTRY glfwReadMemoryImage( const void *data, long size, GLFWimage *img, int flags ); GLFWAPI int GLFWAPIENTRY glfwReadMemoryImage( const void *data, long size, GLFWimage *img, int flags );
GLFWAPI void GLFWAPIENTRY glfwFreeImage( GLFWimage *img ); GLFWAPI void GLFWAPIENTRY glfwFreeImage( GLFWimage *img );
@ -483,4 +483,4 @@ GLFWAPI int GLFWAPIENTRY glfwLoadTextureImage2D( GLFWimage *img, int flags );
} }
#endif #endif
#endif /* __glfw_h_ */ #endif /* __glfw_h_ */

5
src/engine/external/glfw/lib/macosx/macosx_init.c vendored
View file

@ -96,12 +96,13 @@ void _glfwChangeToResourcesDirectory( void )
} }
CFRelease( resourcesURL ); CFRelease( resourcesURL );
/*
/* teeworlds: don't change into resources-dir
if( chdir( resourcesPath ) != 0 ) if( chdir( resourcesPath ) != 0 )
{ {
UNBUNDLED; UNBUNDLED;
} }
*/ */
} }
int _glfwPlatformInit( void ) int _glfwPlatformInit( void )

16
src/engine/external/glfw/lib/win32/platform.h vendored
View file

@ -130,11 +130,15 @@ typedef struct tagKBDLLHOOKSTRUCT {
#endif #endif
// wglSwapIntervalEXT typedef (Win32 buffer-swap interval control) // wglSwapIntervalEXT typedef (Win32 buffer-swap interval control)
typedef int (APIENTRY * WGLSWAPINTERVALEXT_T) (int interval); typedef int (APIENTRY * WGLSWAPINTERVALEXT_T) (int);
// wglChoosePixelFormatARB typedef // wglChoosePixelFormatARB typedef
typedef BOOL (WINAPI * WGLCHOOSEPIXELFORMATARB_T) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); typedef BOOL (WINAPI * WGLCHOOSEPIXELFORMATARB_T) (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
// wglGetPixelFormatAttribivARB typedef // wglGetPixelFormatAttribivARB typedef
typedef BOOL (WINAPI * WGLGETPIXELFORMATATTRIBIVARB_T) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); typedef BOOL (WINAPI * WGLGETPIXELFORMATATTRIBIVARB_T) (HDC, int, int, UINT, const int *, int *);
// wglGetExtensionStringEXT typedef
typedef const char *(APIENTRY * WGLGETEXTENSIONSSTRINGEXT_T)( void );
// wglGetExtensionStringARB typedef
typedef const char *(APIENTRY * WGLGETEXTENSIONSSTRINGARB_T)( HDC );
#define WGL_DRAW_TO_WINDOW_ARB 0x2001 #define WGL_DRAW_TO_WINDOW_ARB 0x2001
#define WGL_SUPPORT_OPENGL_ARB 0x2010 #define WGL_SUPPORT_OPENGL_ARB 0x2010
@ -280,9 +284,11 @@ struct _GLFWwin_struct {
DWORD dwExStyle; // --"-- DWORD dwExStyle; // --"--
// Platform specific extensions (context specific) // Platform specific extensions (context specific)
WGLSWAPINTERVALEXT_T SwapInterval; WGLSWAPINTERVALEXT_T SwapInterval;
WGLCHOOSEPIXELFORMATARB_T ChoosePixelFormat; WGLCHOOSEPIXELFORMATARB_T ChoosePixelFormat;
WGLGETPIXELFORMATATTRIBIVARB_T GetPixelFormatAttribiv; WGLGETPIXELFORMATATTRIBIVARB_T GetPixelFormatAttribiv;
WGLGETEXTENSIONSSTRINGEXT_T GetExtensionsStringEXT;
WGLGETEXTENSIONSSTRINGARB_T GetExtensionsStringARB;
// Various platform specific internal variables // Various platform specific internal variables
int OldMouseLock; // Old mouse-lock flag (used for remembering int OldMouseLock; // Old mouse-lock flag (used for remembering

24
src/engine/external/glfw/lib/win32/win32_glext.c vendored
View file

@ -31,16 +31,6 @@
#include "internal.h" #include "internal.h"
//========================================================================
// We use the WGL_EXT_extensions_string if it is available, or
// WGL_ARB_extensions_string if it is available.
//========================================================================
typedef const char *(APIENTRY * WGLGETEXTENSIONSSTRINGEXT_T)( void );
typedef const char *(APIENTRY * WGLGETEXTENSIONSSTRINGARB_T)( HDC hdc );
//************************************************************************ //************************************************************************
//**** Platform implementation functions **** //**** Platform implementation functions ****
//************************************************************************ //************************************************************************
@ -53,15 +43,11 @@ typedef const char *(APIENTRY * WGLGETEXTENSIONSSTRINGARB_T)( HDC hdc );
int _glfwPlatformExtensionSupported( const char *extension ) int _glfwPlatformExtensionSupported( const char *extension )
{ {
const GLubyte *extensions; const GLubyte *extensions;
WGLGETEXTENSIONSSTRINGEXT_T _wglGetExtensionsStringEXT;
WGLGETEXTENSIONSSTRINGARB_T _wglGetExtensionsStringARB;
// Try wglGetExtensionsStringEXT // Try wglGetExtensionsStringEXT
_wglGetExtensionsStringEXT = (WGLGETEXTENSIONSSTRINGEXT_T) if( _glfwWin.GetExtensionsStringEXT != NULL )
wglGetProcAddress( "wglGetExtensionsStringEXT" );
if( _wglGetExtensionsStringEXT != NULL )
{ {
extensions = (GLubyte *) _wglGetExtensionsStringEXT(); extensions = (GLubyte *) _glfwWin.GetExtensionsStringEXT();
if( extensions != NULL ) if( extensions != NULL )
{ {
if( _glfwStringInExtensionString( extension, extensions ) ) if( _glfwStringInExtensionString( extension, extensions ) )
@ -72,11 +58,9 @@ int _glfwPlatformExtensionSupported( const char *extension )
} }
// Try wglGetExtensionsStringARB // Try wglGetExtensionsStringARB
_wglGetExtensionsStringARB = (WGLGETEXTENSIONSSTRINGARB_T) if( _glfwWin.GetExtensionsStringARB != NULL )
wglGetProcAddress( "wglGetExtensionsStringARB" );
if( _wglGetExtensionsStringARB != NULL )
{ {
extensions = (GLubyte *) _wglGetExtensionsStringARB(_glfwWin.DC); extensions = (GLubyte *) _glfwWin.GetExtensionsStringARB( _glfwWin.DC );
if( extensions != NULL ) if( extensions != NULL )
{ {
if( _glfwStringInExtensionString( extension, extensions ) ) if( _glfwStringInExtensionString( extension, extensions ) )

47
src/engine/external/glfw/lib/win32/win32_window.c vendored
View file

@ -230,12 +230,12 @@ static int _glfwSetPixelFormatAttrib( int redbits, int greenbits, int bluebits,
int PixelFormat, dummy, count = 0; int PixelFormat, dummy, count = 0;
int attribs[128]; int attribs[128];
PIXELFORMATDESCRIPTOR pfd; PIXELFORMATDESCRIPTOR pfd;
int accumredbits = hints->AccumRedBits; int accumredbits = hints->AccumRedBits;
int accumgreenbits = hints->AccumGreenBits; int accumgreenbits = hints->AccumGreenBits;
int accumbluebits = hints->AccumBlueBits; int accumbluebits = hints->AccumBlueBits;
int accumalphabits = hints->AccumAlphaBits; int accumalphabits = hints->AccumAlphaBits;
_glfwSetWGLAttribute( WGL_DRAW_TO_WINDOW_ARB, GL_TRUE ); _glfwSetWGLAttribute( WGL_DRAW_TO_WINDOW_ARB, GL_TRUE );
_glfwSetWGLAttribute( WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB ); _glfwSetWGLAttribute( WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB );
_glfwSetWGLAttribute( WGL_SUPPORT_OPENGL_ARB, GL_TRUE ); _glfwSetWGLAttribute( WGL_SUPPORT_OPENGL_ARB, GL_TRUE );
@ -248,7 +248,7 @@ static int _glfwSetPixelFormatAttrib( int redbits, int greenbits, int bluebits,
_glfwSetWGLAttribute( WGL_DEPTH_BITS_ARB, depthbits ); _glfwSetWGLAttribute( WGL_DEPTH_BITS_ARB, depthbits );
_glfwSetWGLAttribute( WGL_STENCIL_BITS_ARB, stencilbits ); _glfwSetWGLAttribute( WGL_STENCIL_BITS_ARB, stencilbits );
_glfwSetWGLAttribute( WGL_AUX_BUFFERS_ARB, hints->AuxBuffers ); _glfwSetWGLAttribute( WGL_AUX_BUFFERS_ARB, hints->AuxBuffers );
if( accumredbits || accumgreenbits || accumbluebits || accumalphabits ) if( accumredbits || accumgreenbits || accumbluebits || accumalphabits )
{ {
_glfwSetWGLAttribute( WGL_ACCUM_BITS_ARB, accumredbits + _glfwSetWGLAttribute( WGL_ACCUM_BITS_ARB, accumredbits +
@ -884,6 +884,19 @@ static void _glfwInitWGLExtensions( void )
GLubyte *extensions; GLubyte *extensions;
int has_swap_control, has_pixel_format; int has_swap_control, has_pixel_format;
_glfwWin.GetExtensionsStringEXT = (WGLGETEXTENSIONSSTRINGEXT_T)
wglGetProcAddress( "wglGetExtensionsStringEXT" );
if( !_glfwWin.GetExtensionsStringEXT )
{
// Try wglGetExtensionsStringARB
_glfwWin.GetExtensionsStringARB = (WGLGETEXTENSIONSSTRINGARB_T)
wglGetProcAddress( "wglGetExtensionsStringARB" );
if( !_glfwWin.GetExtensionsStringARB )
{
return;
}
}
// Initialize OpenGL extension: WGL_EXT_swap_control // Initialize OpenGL extension: WGL_EXT_swap_control
has_swap_control = GL_FALSE; has_swap_control = GL_FALSE;
has_pixel_format = GL_FALSE; has_pixel_format = GL_FALSE;
@ -950,6 +963,7 @@ static int _glfwCreateWindow( int redbits, int greenbits, int bluebits,
{ {
int full_width, full_height; int full_width, full_height;
RECT wa; RECT wa;
POINT pos;
_glfwWin.DC = NULL; _glfwWin.DC = NULL;
_glfwWin.RC = NULL; _glfwWin.RC = NULL;
@ -1030,6 +1044,12 @@ static int _glfwCreateWindow( int redbits, int greenbits, int bluebits,
// Initialize WGL-specific OpenGL extensions // Initialize WGL-specific OpenGL extensions
_glfwInitWGLExtensions(); _glfwInitWGLExtensions();
// Initialize mouse position
GetCursorPos( &pos );
ScreenToClient( _glfwWin.Wnd, &pos );
_glfwInput.OldMouseX = _glfwInput.MousePosX = pos.x;
_glfwInput.OldMouseY = _glfwInput.MousePosY = pos.y;
return GL_TRUE; return GL_TRUE;
} }
@ -1150,20 +1170,15 @@ int _glfwPlatformOpenWindow( int width, int height,
// Here's a trick for helping us getting window focus // Here's a trick for helping us getting window focus
// (SetForegroundWindow doesn't work properly under // (SetForegroundWindow doesn't work properly under
// Win98/ME/2K/XP/.NET/+) // Win98/ME/2K/.NET/+)
/*
/* if( _glfwLibrary.Sys.WinVer != _GLFW_WIN_95 &&
if( _glfwLibrary.Sys.WinVer == _GLFW_WIN_95 || _glfwLibrary.Sys.WinVer != _GLFW_WIN_NT4 &&
_glfwLibrary.Sys.WinVer == _GLFW_WIN_NT4 || _glfwLibrary.Sys.WinVer != _GLFW_WIN_XP )
_glfwLibrary.Sys.WinVer == _GLFW_WIN_XP )
{
dwStyle |= WS_VISIBLE;
}
else
{ {
dwStyle |= WS_MINIMIZE; dwStyle |= WS_MINIMIZE;
} }
*/ */
} }
else else
{ {
@ -1189,6 +1204,9 @@ int _glfwPlatformOpenWindow( int width, int height,
if( _glfwWin.ChoosePixelFormat && hints->Samples > 0 ) if( _glfwWin.ChoosePixelFormat && hints->Samples > 0 )
{ {
// Iteratively try to create a context with a decreasing number of
// FSAA samples (requires window recreation).
for (;;) for (;;)
{ {
_glfwDestroyWindow(); _glfwDestroyWindow();
@ -1252,7 +1270,6 @@ void _glfwPlatformCloseWindow( void )
// Switch back to desktop resolution // Switch back to desktop resolution
ChangeDisplaySettings( NULL, CDS_FULLSCREEN ); ChangeDisplaySettings( NULL, CDS_FULLSCREEN );
} }
} }

9
src/engine/external/glfw/lib/x11/x11_window.c vendored
View file

@ -978,9 +978,6 @@ int _glfwPlatformOpenWindow( int width, int height, int redbits,
return GL_FALSE; return GL_FALSE;
} }
// Set window & icon name
_glfwPlatformSetWindowTitle( "Teeworlds" );
// Get the delete window WM protocol atom // Get the delete window WM protocol atom
_glfwWin.WMDeleteWindow = XInternAtom( _glfwLibrary.Dpy, _glfwWin.WMDeleteWindow = XInternAtom( _glfwLibrary.Dpy,
"WM_DELETE_WINDOW", "WM_DELETE_WINDOW",
@ -1075,6 +1072,10 @@ int _glfwPlatformOpenWindow( int width, int height, int redbits,
_glfwWin.Width/2, _glfwWin.Height/2 ); _glfwWin.Width/2, _glfwWin.Height/2 );
} }
// Set window & icon name
// teeworlds: set our own title early, workaround for some window-managers
_glfwPlatformSetWindowTitle( "Teeworlds" );
// Connect the context to the window // Connect the context to the window
glXMakeCurrent( _glfwLibrary.Dpy, _glfwWin.Win, _glfwWin.CX ); glXMakeCurrent( _glfwLibrary.Dpy, _glfwWin.Win, _glfwWin.CX );
@ -1521,6 +1522,8 @@ void _glfwPlatformPollEvents( void )
// or without XSync, but when the GL window is rendered over a slow // or without XSync, but when the GL window is rendered over a slow
// network I have noticed bad event syncronisation problems when XSync // network I have noticed bad event syncronisation problems when XSync
// is not used, so I decided to use it. // is not used, so I decided to use it.
//
// teeworlds: don't synchronise
//XSync( _glfwLibrary.Dpy, False ); //XSync( _glfwLibrary.Dpy, False );
// Empty the window event queue // Empty the window event queue