Restructuring of when screen context and events are started stopped, created and...

[freeglut] / src / blackberry / fg_init_blackberry.c

diff --git a/src/blackberry/fg_init_blackberry.c b/src/blackberry/fg_init_blackberry.c
index 40b1ed6..aaef2cb 100644 (file)
--- a/src/blackberry/fg_init_blackberry.c
+++ b/src/blackberry/fg_init_blackberry.c
@@ -29,30 +29,38 @@
 #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 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();
 }
 
 /**