X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffg_xinput_x11.c;h=cdc3abe1c0283e89b6137d2c80fbf7f5e9b8685d;hb=002dae879eda329f38fe65cb6f99d4f481a2eb47;hp=023e068136439d62dc801deaaac9126ebc12f480;hpb=6dc97d7f1133eab6d075159c38f9cbd816de84e7;p=freeglut diff --git a/src/x11/fg_xinput_x11.c b/src/x11/fg_xinput_x11.c index 023e068..cdc3abe 100644 --- a/src/x11/fg_xinput_x11.c +++ b/src/x11/fg_xinput_x11.c @@ -16,7 +16,7 @@ /* convert the XInput button state mask to the regular X mouse event button mask */ #define BUTTON_MASK(xistate) ((xistate) << 8) -/* import function from freeglut_main.c */ +/* import function from fg_main.c */ extern int fgPlatformGetModifiers( int state ); /* extension opcode for XInput */ @@ -215,7 +215,7 @@ void fgHandleExtensionEvents( XEvent* base_ev ) std_ev.xbutton.y = event->event_y; std_ev.xbutton.x_root = event->root_x; std_ev.xbutton.y_root = event->root_y; - std_ev.xbutton.state = BUTTON_MASK(*(unsigned int*)event->buttons.mask); + std_ev.xbutton.state = event->mods.base; std_ev.xbutton.button = event->detail; XPutBackEvent(fgDisplay.pDisplay.Display, &std_ev);