FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken X11 menus. The MPX patch would naively just call the

Browse Source 
standard (non-multi) callbacks directly, overriding all the
menu-handling logic in the standard X event processing loop.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1375 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
jtsiomb 2012-07-29 04:11:01 +00:00
parent 8c81fedaa0
commit 3162c53c9f
1 changed files with 97 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
freeglut/freeglut/src/x11/fg_xinput_x11.c
View File

@ -138,29 +138,34 @@ void fgPrintXIDeviceEvent(XIDeviceEvent* event)
} }
/** /**
* \brief This function is called when an Extension Event is received * \brief This function is called when an Extension Event is received
* and calls the corresponding callback functions for these events. * and calls the corresponding callback functions for these events.
*/ */
void fgHandleExtensionEvents( XEvent* base_ev ) { void fgHandleExtensionEvents( XEvent* base_ev )
{
XEvent std_ev; /* standard single-pointer event to be added to the event queue */
int i, button = 0; int i, button = 0;
XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie); XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
/* initialize the generic fields from base_ev */
std_ev.xany = base_ev->xany;
if ( XGetEventData( fgDisplay.pDisplay.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); XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
XIEnterEvent *evcross;
/*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/ /*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
SFG_Window* window = fgWindowByHandle( event->event ); SFG_Window* window = fgWindowByHandle( event->event );
if (!window) return; if (!window) return;
switch (cookie->evtype) { switch (cookie->evtype) {
case XI_Enter: case XI_Enter:
case XI_Leave: case XI_Leave:
fgState.Modifiers = fgPlatformGetModifiers( ((XIEnterEvent*)event)->mods.base ); evcross = (XIEnterEvent*)event;
fgState.Modifiers = fgPlatformGetModifiers( evcross->mods.base );
INVOKE_WCB( *window, MultiEntry, ( INVOKE_WCB( *window, MultiEntry, (
event->deviceid, event->deviceid,
(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT) (event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
@ -168,6 +173,23 @@ void fgHandleExtensionEvents( XEvent* base_ev ) {
#if _DEBUG #if _DEBUG
fgPrintXILeaveEvent((XILeaveEvent*)event); fgPrintXILeaveEvent((XILeaveEvent*)event);
#endif #endif
/* Also process the standard crossing event */
std_ev.type = evcross->evtype == XI_Enter ? EnterNotify : LeaveNotify;
std_ev.xcrossing.window = evcross->event;
std_ev.xcrossing.root = evcross->root;
std_ev.xcrossing.subwindow = evcross->child;
std_ev.xcrossing.x = evcross->event_x;
std_ev.xcrossing.y = evcross->event_y;
std_ev.xcrossing.x_root = evcross->root_x;
std_ev.xcrossing.y_root = evcross->root_y;
std_ev.xcrossing.mode = evcross->mode;
std_ev.xcrossing.detail = evcross->detail;
std_ev.xcrossing.same_screen = evcross->same_screen;
std_ev.xcrossing.focus = evcross->focus;
std_ev.xcrossing.state = *(unsigned int*)evcross->buttons.mask;
XPutBackEvent(fgDisplay.pDisplay.Display, &std_ev);
break; break;
case XI_ButtonPress: case XI_ButtonPress:
@ -177,30 +199,55 @@ void fgHandleExtensionEvents( XEvent* base_ev ) {
event->deviceid, event->deviceid,
event->event_x, event->event_x,
event->event_y, event->event_y,
(event->detail)-1, event->detail-1,
(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP) (event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP)
)); ));
INVOKE_WCB( *window, Mouse, (
(event->detail)-1, /* Also process the standard button event */
(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP), std_ev.type = event->evtype == XI_ButtonPress ? ButtonPress : ButtonRelease;
event->event_x, std_ev.xbutton.window = event->event;
event->event_y std_ev.xbutton.root = event->root;
)); std_ev.xbutton.subwindow = event->child;
std_ev.xbutton.x = event->event_x;
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 = *(unsigned int*)event->buttons.mask;
std_ev.xbutton.button = event->detail;
XPutBackEvent(fgDisplay.pDisplay.Display, &std_ev);
break; break;
case XI_Motion: case XI_Motion:
fgState.Modifiers = fgPlatformGetModifiers( event->mods.base ); fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
for (i = 0; i < event->buttons.mask_len; i++) if (event->buttons.mask[i]) button = 1; for (i = 0; i < event->buttons.mask_len; i++) {
if (event->buttons.mask[i]) {
button = 1;
}
}
if (button) { if (button) {
INVOKE_WCB( *window, MultiMotion, ( event->deviceid, event->event_x, event->event_y ) ); INVOKE_WCB( *window, MultiMotion, ( event->deviceid, event->event_x, event->event_y ) );
INVOKE_WCB( *window, Motion, ( event->event_x, event->event_y ) );
} else { } else {
INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) ); INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) );
INVOKE_WCB( *window, Passive, ( event->event_x, event->event_y ) );
} }
#if _DEBUG #if _DEBUG
fgPrintXIDeviceEvent(event); fgPrintXIDeviceEvent(event);
#endif #endif
/* Also process the standard motion event */
std_ev.type = MotionNotify;
std_ev.xmotion.window = event->event;
std_ev.xmotion.root = event->root;
std_ev.xmotion.subwindow = event->child;
std_ev.xmotion.time = event->time;
std_ev.xmotion.x = event->event_x;
std_ev.xmotion.y = event->event_y;
std_ev.xmotion.x_root = event->root_x;
std_ev.xmotion.y_root = event->root_y;
std_ev.xmotion.state = *(unsigned int*)event->buttons.mask;
std_ev.xmotion.is_hint = NotifyNormal;
XPutBackEvent(fgDisplay.pDisplay.Display, &std_ev);
break; break;
default: default: