projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version bump in cmake, that should have been done for 3.2.0. Changed SO_MINOR
[freeglut]
/
src
/
x11
/
fg_xinput_x11.c
diff --git
a/src/x11/fg_xinput_x11.c
b/src/x11/fg_xinput_x11.c
index
023e068
..
5dcbb8d
100644
(file)
--- a/
src/x11/fg_xinput_x11.c
+++ b/
src/x11/fg_xinput_x11.c
@@
-16,11
+16,11
@@
/* convert the XInput button state mask to the regular X mouse event button mask */
#define BUTTON_MASK(xistate) ((xistate) << 8)
/* 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 */
extern int fgPlatformGetModifiers( int state );
/* extension opcode for XInput */
-int xi_opcode = -1;
+static int xi_opcode = -1;
/**
* \brief Sets window up for XI2 events.
/**
* \brief Sets window up for XI2 events.
@@
-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.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);
std_ev.xbutton.button = event->detail;
XPutBackEvent(fgDisplay.pDisplay.Display, &std_ev);