X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fblackberry%2Ffg_init_blackberry.c;h=ed1b1c964570ee8d037942c936493cb18f039f40;hb=3653e0a1fb5a04d325e7a573df0b86cb779a9d35;hp=40b1ed62d8fc79ec4eeb64415b2621e9dc436f32;hpb=1f67274c9ebf2ed21d6302af23175a24ed56c820;p=freeglut

diff --git a/src/blackberry/fg_init_blackberry.c b/src/blackberry/fg_init_blackberry.c
index 40b1ed6..ed1b1c9 100644
--- a/src/blackberry/fg_init_blackberry.c
+++ b/src/blackberry/fg_init_blackberry.c
@@ -29,30 +29,71 @@
 #include "fg_init.h"
 #include "egl/fg_init_egl.h"
 #include <bps/bps.h>
-#include <bps/navigator.h>
+#include <screen/screen.h>
 
 void fgPlatformInitialize()
 {
-  bps_initialize();
+    bps_initialize();
 
-  navigator_request_events(0);
-  //XXX rotation lock? navigator_rotation_lock(true);
+    fghPlatformInitializeEGL();
 
-  fghPlatformInitializeEGL();
+    /* Prepare for screen events */
+    fgDisplay.pDisplay.event = NULL;
+    fgDisplay.pDisplay.screenContext = NULL;
 
-  /* Get start time */
-  fgState.Time = fgSystemTime();
+    /* Create window */
+    if (screen_create_context(&fgDisplay.pDisplay.screenContext, 0)) {
+        fgError("Could not create screen context");
+        return;
+    }
 
-  fgState.Initialised = GL_TRUE;
+    /* Get screen size */
+    int displayCount;
+    screen_display_t* displays;
+    int vals[2];
+    if(screen_get_context_property_iv(fgDisplay.pDisplay.screenContext, SCREEN_PROPERTY_DISPLAY_COUNT, &displayCount)) {
+        fgWarning("Could not get display count. Screen size not determined and will be left at default values");
+    } else if(displayCount >= 1) {
+        displays = (screen_display_t*)calloc(displayCount, sizeof(screen_display_t));
+        if(screen_get_context_property_pv(fgDisplay.pDisplay.screenContext, SCREEN_PROPERTY_DISPLAYS, (void**)displays)) {
+            fgWarning("Could not get displays. Screen size not determined and will be left at default values");
+        } else {
+            /* We only care about the first one, which is the device display */
+            if(screen_get_display_property_iv(displays[0], SCREEN_PROPERTY_SIZE, vals)) {
+                fgWarning("Could not get display size. Values will be left at default");
+            } else {
+                if(screen_get_display_property_iv(displays[0], SCREEN_PROPERTY_ROTATION, &displayCount) || (displayCount == 0 || displayCount == 180)) {
+                    fgDisplay.ScreenWidth = vals[0];
+                    fgDisplay.ScreenHeight = vals[1];
+                } else {
+                    fgDisplay.ScreenWidth = vals[1];
+                    fgDisplay.ScreenHeight = vals[0];
+                }
+            }
+            if(screen_get_display_property_iv(displays[0], SCREEN_PROPERTY_PHYSICAL_SIZE, vals)) {
+                fgWarning("Could not get physical display size. Values will be left at default");
+            } else {
+                fgDisplay.ScreenWidthMM = vals[0];
+                fgDisplay.ScreenHeightMM = vals[1];
+            }
+        }
+        free(displays);
+    }
+
+    /* Get start time */
+    fgState.Time = fgSystemTime();
+
+    fgState.Initialised = GL_TRUE;
 }
 
 void fgPlatformCloseDisplay()
 {
-  fghPlatformCloseDisplayEGL();
+    fghPlatformCloseDisplayEGL();
 
-  navigator_stop_events(0);
+    screen_destroy_context(fgDisplay.pDisplay.screenContext);
+    fgDisplay.pDisplay.screenContext = NULL;
 
-  bps_shutdown();
+    bps_shutdown();
 }
 
 /**