gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund 2013-04-14 16:33:20 +02:00
parent 52ade53553
commit 32273c5d96
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/x11_init.c
View File

@ -477,18 +477,18 @@ static GLboolean initDisplay(void)
if (XQueryExtension(_glfw.x11.display, if (XQueryExtension(_glfw.x11.display,
"XInputExtension", "XInputExtension",
&_glfw.x11.xi2.majorOpcode, &_glfw.x11.xi.majorOpcode,
&_glfw.x11.xi2.eventBase, &_glfw.x11.xi.eventBase,
&_glfw.x11.xi2.errorBase)) &_glfw.x11.xi.errorBase))
{ {
_glfw.x11.xi2.versionMajor = 2; _glfw.x11.xi.versionMajor = 2;
_glfw.x11.xi2.versionMinor = 0; _glfw.x11.xi.versionMinor = 0;
if (XIQueryVersion(_glfw.x11.display, if (XIQueryVersion(_glfw.x11.display,
&_glfw.x11.xi2.versionMajor, &_glfw.x11.xi.versionMajor,
&_glfw.x11.xi2.versionMinor) != BadRequest) &_glfw.x11.xi.versionMinor) != BadRequest)
{ {
_glfw.x11.xi2.available = GL_TRUE; _glfw.x11.xi.available = GL_TRUE;
} }
} }

2
src/x11_platform.h
View File

@ -159,7 +159,7 @@ typedef struct _GLFWlibraryX11
int errorBase; int errorBase;
int versionMajor; int versionMajor;
int versionMinor; int versionMinor;
} xi2; } xi;
// LUT for mapping X11 key codes to GLFW key codes // LUT for mapping X11 key codes to GLFW key codes
int keyCodeLUT[256]; int keyCodeLUT[256];

4
src/x11_window.c
View File

@ -238,7 +238,7 @@ static GLboolean createWindow(_GLFWwindow* window,
XFree(hints); XFree(hints);
} }
if (_glfw.x11.xi2.available) if (_glfw.x11.xi.available)
{ {
// Select for XInput2 events // Select for XInput2 events
@ -747,7 +747,7 @@ static void processEvent(XEvent *event)
case GenericEvent: case GenericEvent:
{ {
if (event->xcookie.extension == _glfw.x11.xi2.majorOpcode && if (event->xcookie.extension == _glfw.x11.xi.majorOpcode &&
XGetEventData(_glfw.x11.display, &event->xcookie)) XGetEventData(_glfw.x11.display, &event->xcookie))
{ {
if (event->xcookie.evtype == XI_Motion) if (event->xcookie.evtype == XI_Motion)