Formatting.
This commit is contained in:
parent
fccef20b76
commit
32b07923ab
@ -69,10 +69,10 @@
|
|||||||
// Some old versions of w32api (used by MinGW and Cygwin) define
|
// Some old versions of w32api (used by MinGW and Cygwin) define
|
||||||
// WH_KEYBOARD_LL without typedef:ing KBDLLHOOKSTRUCT (!)
|
// WH_KEYBOARD_LL without typedef:ing KBDLLHOOKSTRUCT (!)
|
||||||
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
||||||
#include <w32api.h>
|
#include <w32api.h>
|
||||||
#if defined(WH_KEYBOARD_LL) && (__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 2)
|
#if defined(WH_KEYBOARD_LL) && (__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 2)
|
||||||
#undef WH_KEYBOARD_LL
|
#undef WH_KEYBOARD_LL
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
@ -92,64 +92,64 @@ typedef struct tagKBDLLHOOKSTRUCT {
|
|||||||
#endif // WH_KEYBOARD_LL
|
#endif // WH_KEYBOARD_LL
|
||||||
|
|
||||||
#ifndef LLKHF_ALTDOWN
|
#ifndef LLKHF_ALTDOWN
|
||||||
#define LLKHF_ALTDOWN 0x00000020
|
#define LLKHF_ALTDOWN 0x00000020
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SPI_SETSCREENSAVERRUNNING
|
#ifndef SPI_SETSCREENSAVERRUNNING
|
||||||
#define SPI_SETSCREENSAVERRUNNING 97
|
#define SPI_SETSCREENSAVERRUNNING 97
|
||||||
#endif
|
#endif
|
||||||
#ifndef SPI_GETANIMATION
|
#ifndef SPI_GETANIMATION
|
||||||
#define SPI_GETANIMATION 72
|
#define SPI_GETANIMATION 72
|
||||||
#endif
|
#endif
|
||||||
#ifndef SPI_SETANIMATION
|
#ifndef SPI_SETANIMATION
|
||||||
#define SPI_SETANIMATION 73
|
#define SPI_SETANIMATION 73
|
||||||
#endif
|
#endif
|
||||||
#ifndef SPI_GETFOREGROUNDLOCKTIMEOUT
|
#ifndef SPI_GETFOREGROUNDLOCKTIMEOUT
|
||||||
#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000
|
#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000
|
||||||
#endif
|
#endif
|
||||||
#ifndef SPI_SETFOREGROUNDLOCKTIMEOUT
|
#ifndef SPI_SETFOREGROUNDLOCKTIMEOUT
|
||||||
#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001
|
#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CDS_FULLSCREEN
|
#ifndef CDS_FULLSCREEN
|
||||||
#define CDS_FULLSCREEN 4
|
#define CDS_FULLSCREEN 4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef PFD_GENERIC_ACCELERATED
|
#ifndef PFD_GENERIC_ACCELERATED
|
||||||
#define PFD_GENERIC_ACCELERATED 0x00001000
|
#define PFD_GENERIC_ACCELERATED 0x00001000
|
||||||
#endif
|
#endif
|
||||||
#ifndef PFD_DEPTH_DONTCARE
|
#ifndef PFD_DEPTH_DONTCARE
|
||||||
#define PFD_DEPTH_DONTCARE 0x20000000
|
#define PFD_DEPTH_DONTCARE 0x20000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ENUM_CURRENT_SETTINGS
|
#ifndef ENUM_CURRENT_SETTINGS
|
||||||
#define ENUM_CURRENT_SETTINGS -1
|
#define ENUM_CURRENT_SETTINGS -1
|
||||||
#endif
|
#endif
|
||||||
#ifndef ENUM_REGISTRY_SETTINGS
|
#ifndef ENUM_REGISTRY_SETTINGS
|
||||||
#define ENUM_REGISTRY_SETTINGS -2
|
#define ENUM_REGISTRY_SETTINGS -2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WM_MOUSEWHEEL
|
#ifndef WM_MOUSEWHEEL
|
||||||
#define WM_MOUSEWHEEL 0x020A
|
#define WM_MOUSEWHEEL 0x020A
|
||||||
#endif
|
#endif
|
||||||
#ifndef WHEEL_DELTA
|
#ifndef WHEEL_DELTA
|
||||||
#define WHEEL_DELTA 120
|
#define WHEEL_DELTA 120
|
||||||
#endif
|
#endif
|
||||||
#ifndef WM_MOUSEHWHEEL
|
#ifndef WM_MOUSEHWHEEL
|
||||||
#define WM_MOUSEHWHEEL 0x020E
|
#define WM_MOUSEHWHEEL 0x020E
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WM_XBUTTONDOWN
|
#ifndef WM_XBUTTONDOWN
|
||||||
#define WM_XBUTTONDOWN 0x020B
|
#define WM_XBUTTONDOWN 0x020B
|
||||||
#endif
|
#endif
|
||||||
#ifndef WM_XBUTTONUP
|
#ifndef WM_XBUTTONUP
|
||||||
#define WM_XBUTTONUP 0x020C
|
#define WM_XBUTTONUP 0x020C
|
||||||
#endif
|
#endif
|
||||||
#ifndef XBUTTON1
|
#ifndef XBUTTON1
|
||||||
#define XBUTTON1 1
|
#define XBUTTON1 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef XBUTTON2
|
#ifndef XBUTTON2
|
||||||
#define XBUTTON2 2
|
#define XBUTTON2 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -179,34 +179,34 @@ typedef DWORD (WINAPI * TIMEGETTIME_T) (void);
|
|||||||
|
|
||||||
// gdi32.dll shortcuts
|
// gdi32.dll shortcuts
|
||||||
#ifndef _GLFW_NO_DLOAD_GDI32
|
#ifndef _GLFW_NO_DLOAD_GDI32
|
||||||
#define _glfw_ChoosePixelFormat _glfwLibrary.Win32.gdi.ChoosePixelFormat
|
#define _glfw_ChoosePixelFormat _glfwLibrary.Win32.gdi.ChoosePixelFormat
|
||||||
#define _glfw_DescribePixelFormat _glfwLibrary.Win32.gdi.DescribePixelFormat
|
#define _glfw_DescribePixelFormat _glfwLibrary.Win32.gdi.DescribePixelFormat
|
||||||
#define _glfw_GetPixelFormat _glfwLibrary.Win32.gdi.GetPixelFormat
|
#define _glfw_GetPixelFormat _glfwLibrary.Win32.gdi.GetPixelFormat
|
||||||
#define _glfw_SetPixelFormat _glfwLibrary.Win32.gdi.SetPixelFormat
|
#define _glfw_SetPixelFormat _glfwLibrary.Win32.gdi.SetPixelFormat
|
||||||
#define _glfw_SwapBuffers _glfwLibrary.Win32.gdi.SwapBuffers
|
#define _glfw_SwapBuffers _glfwLibrary.Win32.gdi.SwapBuffers
|
||||||
#define _glfw_GetDeviceGammaRamp _glfwLibrary.Win32.gdi.GetDeviceGammaRamp
|
#define _glfw_GetDeviceGammaRamp _glfwLibrary.Win32.gdi.GetDeviceGammaRamp
|
||||||
#define _glfw_SetDeviceGammaRamp _glfwLibrary.Win32.gdi.SetDeviceGammaRamp
|
#define _glfw_SetDeviceGammaRamp _glfwLibrary.Win32.gdi.SetDeviceGammaRamp
|
||||||
#else
|
#else
|
||||||
#define _glfw_ChoosePixelFormat ChoosePixelFormat
|
#define _glfw_ChoosePixelFormat ChoosePixelFormat
|
||||||
#define _glfw_DescribePixelFormat DescribePixelFormat
|
#define _glfw_DescribePixelFormat DescribePixelFormat
|
||||||
#define _glfw_GetPixelFormat GetPixelFormat
|
#define _glfw_GetPixelFormat GetPixelFormat
|
||||||
#define _glfw_SetPixelFormat SetPixelFormat
|
#define _glfw_SetPixelFormat SetPixelFormat
|
||||||
#define _glfw_SwapBuffers SwapBuffers
|
#define _glfw_SwapBuffers SwapBuffers
|
||||||
#define _glfw_GetDeviceGammaRamp GetDeviceGammaRamp
|
#define _glfw_GetDeviceGammaRamp GetDeviceGammaRamp
|
||||||
#define _glfw_SetDeviceGammaRamp SetDeviceGammaRamp
|
#define _glfw_SetDeviceGammaRamp SetDeviceGammaRamp
|
||||||
#endif // _GLFW_NO_DLOAD_GDI32
|
#endif // _GLFW_NO_DLOAD_GDI32
|
||||||
|
|
||||||
// winmm.dll shortcuts
|
// winmm.dll shortcuts
|
||||||
#ifndef _GLFW_NO_DLOAD_WINMM
|
#ifndef _GLFW_NO_DLOAD_WINMM
|
||||||
#define _glfw_joyGetDevCaps _glfwLibrary.Win32.winmm.joyGetDevCaps
|
#define _glfw_joyGetDevCaps _glfwLibrary.Win32.winmm.joyGetDevCaps
|
||||||
#define _glfw_joyGetPos _glfwLibrary.Win32.winmm.joyGetPos
|
#define _glfw_joyGetPos _glfwLibrary.Win32.winmm.joyGetPos
|
||||||
#define _glfw_joyGetPosEx _glfwLibrary.Win32.winmm.joyGetPosEx
|
#define _glfw_joyGetPosEx _glfwLibrary.Win32.winmm.joyGetPosEx
|
||||||
#define _glfw_timeGetTime _glfwLibrary.Win32.winmm.timeGetTime
|
#define _glfw_timeGetTime _glfwLibrary.Win32.winmm.timeGetTime
|
||||||
#else
|
#else
|
||||||
#define _glfw_joyGetDevCaps joyGetDevCaps
|
#define _glfw_joyGetDevCaps joyGetDevCaps
|
||||||
#define _glfw_joyGetPos joyGetPos
|
#define _glfw_joyGetPos joyGetPos
|
||||||
#define _glfw_joyGetPosEx joyGetPosEx
|
#define _glfw_joyGetPosEx joyGetPosEx
|
||||||
#define _glfw_timeGetTime timeGetTime
|
#define _glfw_timeGetTime timeGetTime
|
||||||
#endif // _GLFW_NO_DLOAD_WINMM
|
#endif // _GLFW_NO_DLOAD_WINMM
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user