X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffreeglut_xinput_x11.c;h=54adf723a5640bead3f3b41b5b278fb4f64bdf49;hb=6c3c78f5fe46f0126e26dcae456ebdec502913f5;hp=40677faa1c46805a93e7b075c91bbc11b072ea05;hpb=76abafb9109bfc14c93c9f86574b7a1ce1dae957;p=freeglut diff --git a/src/x11/freeglut_xinput_x11.c b/src/x11/freeglut_xinput_x11.c index 40677fa..54adf72 100644 --- a/src/x11/freeglut_xinput_x11.c +++ b/src/x11/freeglut_xinput_x11.c @@ -28,7 +28,7 @@ void fgRegisterDevices( Display* dpy, Window* win ) { unsigned char flags[2] = { 0, 0 }; int event, error; - /*Display* dpy = fgDisplay.Display; + /*Display* dpy = fgDisplay.pDisplay.Display; Window* win = glutGetXWindow();*/ /* get XInput extension opcode */ @@ -148,7 +148,7 @@ void fgHandleExtensionEvents( XEvent* base_ev ) { int i, button = 0; XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie); - if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) { + if ( XGetEventData( fgDisplay.pDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) { XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data); /*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/ @@ -212,7 +212,7 @@ void fgHandleExtensionEvents( XEvent* base_ev ) { } fgState.Modifiers = INVALID_MODIFIERS; } - XFreeEventData( fgDisplay.Display, cookie ); + XFreeEventData( fgDisplay.pDisplay.Display, cookie ); } #endif