X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fblackberry%2Ffg_main_blackberry.c;h=71f7b6ddf793c1b0e29238e578b9c0ad82bdbb58;hb=93446bbd64d53c23881fd296a8e4a99323c7c30f;hp=827365b6a5b8c84eaaf56305f40fefd5a90f1747;hpb=fcebd3bb257c8dc9d751543d83cf03d87fb30bec;p=freeglut

diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c
index 827365b..71f7b6d 100644
--- a/src/blackberry/fg_main_blackberry.c
+++ b/src/blackberry/fg_main_blackberry.c
@@ -161,7 +161,7 @@ fg_time_t fgPlatformSystemTime ( void )
 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");
     }
 }
@@ -266,12 +266,18 @@ int fgPlatformGetModifiers (int mod)
 
 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);
@@ -500,12 +506,18 @@ void fgPlatformProcessSingleEvent ( void )
                     {
                     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));
@@ -531,19 +543,45 @@ void fgPlatformProcessSingleEvent ( void )
                 }
 
                 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;
@@ -580,8 +618,7 @@ void fgPlatformMainLoopPostWork ( void )
 /* 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);