void fgPlatformSleepForEvents( fg_time_t msec )
{
//XXX: Is this right? Is there a more direct way to access the context?
- if(fgStructure.CurrentWindow && bps_get_event(&fgDisplay.pDisplay.event, (int)msec) != BPS_SUCCESS) {
+ if(fgStructure.CurrentWindow && fgDisplay.pDisplay.event == NULL && bps_get_event(&fgDisplay.pDisplay.event, (int)msec) != BPS_SUCCESS) {
LOGW("BPS couldn't get event");
}
}
void fgPlatformProcessSingleEvent ( void )
{
+ if(fgStructure.CurrentWindow == NULL) {
+ //XXX Is this right? Would this just cause a whole lot of busy looping while we wait for events?
+ LOGW("fgPlatformProcessSingleEvent: Missing current window. Skipping event processing");
+ return;
+ }
+
int domain;
do
{
if(fgDisplay.pDisplay.event != NULL) {
SFG_Window* window = fgStructure.CurrentWindow;
- if (window != NULL && window->Window.Handle != NULL) {
+ if (window->Window.Handle != NULL) {
int size[2];
screen_get_window_property_iv(window->Window.Handle, SCREEN_PROPERTY_BUFFER_SIZE, size);
fghOnReshapeNotify(window,size[0],size[1],GL_FALSE);
}
if (wheel) {
+ /* Very slightly modified from fg_main_mswin.
+ * Because we don't want MouseWheel to be called every. single. time.
+ * That the action occurs, we mimic the Windows version with "wheel deltas"
+ * XXX Do we even want this?
+ * XXX If we want this, it's possible to get horizontal scroll as well.
+ * XXX -Vertical scroll=wheel 0, horizontal=wheel 1? */
fgState.MouseWheelTicks -= wheel;
- //TODO: Implement wheel support (based on fg_main_mswin... though it seems excessive)
+ if (abs(fgState.MouseWheelTicks) >= WHEEL_DELTA)
+ {
+ int wheel_number = 0;
+ int direction = (fgState.MouseWheelTicks > 0) ? -1 : 1;
+
+ if (!FETCH_WCB(*window, MouseWheel) && !FETCH_WCB(*window, Mouse))
+ break;
+
+ //XXX fgSetWindow(window);
+
+ while(abs(fgState.MouseWheelTicks) >= WHEEL_DELTA)
+ {
+ if (FETCH_WCB(*window, MouseWheel))
+ INVOKE_WCB(*window, MouseWheel, (wheel_number, direction, window->State.MouseX, window->State.MouseY));
+ else /* No mouse wheel, call the mouse button callback twice */
+ {
+ /*
+ * Map wheel zero to button 3 and 4; +1 to 3, -1 to 4
+ * " " one +1 to 5, -1 to 6, ...
+ *
+ * XXX The below assumes that you have no more than 3 mouse
+ * XXX buttons. Sorry.
+ */
+ int button = wheel_number * 2 + 3;
+ if (direction < 0)
+ ++button;
+ INVOKE_WCB(*window, Mouse, (button, GLUT_DOWN, window->State.MouseX, window->State.MouseY));
+ INVOKE_WCB(*window, Mouse, (button, GLUT_UP, window->State.MouseX, window->State.MouseY));
+ }
+
+ fgState.MouseWheelTicks -= WHEEL_DELTA * direction;
+ }
+ }
}
fgState.Modifiers = INVALID_MODIFIERS;
{
case NAVIGATOR_WINDOW_FULLSCREEN:
LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_STATE-NAVIGATOR_WINDOW_FULLSCREEN");
- INVOKE_WCB(*window, AppStatus, (GLUT_APPSTATUS_RESUME));
+ window->State.Visible = GL_TRUE;
+ INVOKE_WCB(*window, WindowStatus, (GLUT_FULLY_RETAINED));
break;
case NAVIGATOR_WINDOW_THUMBNAIL:
+ LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_STATE-NAVIGATOR_WINDOW_THUMBNAIL");
+ window->State.Visible = GL_TRUE;
+ INVOKE_WCB(*window, WindowStatus, (GLUT_PARTIALLY_RETAINED));
+ break;
case NAVIGATOR_WINDOW_INVISIBLE:
- LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_STATE-NAVIGATOR_WINDOW_THUMBNAIL/NAVIGATOR_WINDOW_INVISIBLE");
- INVOKE_WCB(*window, AppStatus, (GLUT_APPSTATUS_PAUSE));
+ LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_STATE-NAVIGATOR_WINDOW_INVISIBLE");
+ window->State.Visible = GL_FALSE;
+ INVOKE_WCB(*window, WindowStatus, (GLUT_HIDDEN)); //XXX Should this be GLUT_FULLY_COVERED?
break;
default:
LOGW("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_STATE unknown: 0x%X", SLOG2_FA_SIGNED(state));
}
case NAVIGATOR_SWIPE_DOWN:
+ /* XXX Open app menu */
+ break;
+
case NAVIGATOR_BACK:
+ /* XXX Should this be a Special/SpecialUp event? */
+ break;
+
case NAVIGATOR_WINDOW_ACTIVE:
+ LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_ACTIVE");
+ INVOKE_WCB(*window, AppStatus, (GLUT_APPSTATUS_RESUME));
+ break;
+
case NAVIGATOR_WINDOW_INACTIVE:
+ LOGI("fgPlatformProcessSingleEvent: NAVIGATOR_WINDOW_INACTIVE");
+ INVOKE_WCB(*window, AppStatus, (GLUT_APPSTATUS_PAUSE));
+ break;
+
case NAVIGATOR_KEYBOARD_STATE:
case NAVIGATOR_KEYBOARD_POSITION:
+ /* TODO Something needs to be done with this. Not sure what */
+ break;
+
case NAVIGATOR_DEVICE_LOCK_STATE:
+ break;
+
case NAVIGATOR_WINDOW_COVER:
case NAVIGATOR_WINDOW_COVER_ENTER:
case NAVIGATOR_WINDOW_COVER_EXIT:
+ /* BlackBerry specific. Let app status and window status take care of everything */
+ break;
+
case NAVIGATOR_APP_STATE:
- //XXX Should probably do something with these
+ /* Can do the same as NAVIGATOR_WINDOW_ACTIVE/NAVIGATOR_WINDOW_INACTIVE but
+ seems less likely to work when the app comes to the foreground. Might be a bug */
break;
+ case 0: //Doesn't exist in header, but shows up when keyboard shows and resizes
+ break;
+
default:
LOGW("fgPlatformProcessSingleEvent: unknown navigator event: 0x%X", SLOG2_FA_SIGNED(eventType));
break;
/* deal with work list items */
void fgPlatformInitWork(SFG_Window* window)
{
- /* notify windowStatus/visibility */
- INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_RETAINED ) );
+ LOGI("fgPlatformInitWork");
/* Position callback, always at 0,0 */
fghOnPositionNotify(window, 0, 0, GL_TRUE);