X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fblackberry%2Ffg_window_blackberry.c;h=61bd58d6f547fcc5c80a4fcfa03163d1e33c9c42;hb=53897b97e617ca478288b78b9ff363d97ba3f74e;hp=1f13b554c0559c0c49cc60cbf41dca80af604d9b;hpb=3e7cf561c1470dbee736cd9b371fef14aa5491b1;p=freeglut

diff --git a/src/blackberry/fg_window_blackberry.c b/src/blackberry/fg_window_blackberry.c
index 1f13b55..61bd58d 100644
--- a/src/blackberry/fg_window_blackberry.c
+++ b/src/blackberry/fg_window_blackberry.c
@@ -43,79 +43,83 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
                            GLboolean sizeUse, int w, int h,
                            GLboolean gameMode, GLboolean isSubWindow )
 {
-  /* TODO: only one full-screen window possible? */
-  if (fgDisplay.pDisplay.single_native_window != NULL) {
-    fgWarning("You can't have more than one window on BlackBerry");
-    return;
-  }
-
-  /* Create window */
-  if (screen_create_context(&window->Window.pContext.screenContext, 0)) {
-    fgError("Could not create screen context");
-	return;
-  }
-  screen_window_t sWindow;
-  if (screen_create_window(&sWindow, window->Window.pContext.screenContext)) {
-	screen_destroy_context(window->Window.pContext.screenContext);
-  	fgError("Could not create window");
-  	return;
-  }
-  fgDisplay.pDisplay.single_native_window = sWindow;
-
-  /* Set window properties */
-  int screenFormat = SCREEN_FORMAT_RGBA8888;
-#ifdef __X86__
-  int screenUsage = SCREEN_USAGE_OPENGL_ES2;
-#else
-  int screenUsage = SCREEN_USAGE_DISPLAY | SCREEN_USAGE_OPENGL_ES2; // Physical device copy directly into physical display
+    /* TODO: only one full-screen window possible? */
+    if (fgDisplay.pDisplay.single_native_window != NULL) {
+        fgWarning("You can't have more than one window on BlackBerry");
+        return;
+    }
+
+    /* Create window */
+    screen_window_t sWindow;
+    if (screen_create_window(&sWindow, fgDisplay.pDisplay.screenContext)) {
+        fgError("Could not create window");
+        return;
+    }
+    fgDisplay.pDisplay.single_native_window = sWindow;
+
+    /* Set window properties */
+    int screenFormat = SCREEN_FORMAT_RGBA8888; //XXX Should this be determined by config?
+#ifdef GL_ES_VERSION_2_0
+    int screenUsage = SCREEN_USAGE_OPENGL_ES2;
+#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
+    int screenUsage = SCREEN_USAGE_OPENGL_ES1;
 #endif
-  if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_FORMAT, &screenFormat)) {
-	screen_destroy_window(sWindow);
-	screen_destroy_context(window->Window.pContext.screenContext);
-	fgError("Could not set window format");
-	return;
-  }
-  if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_USAGE, &screenUsage)) {
-	screen_destroy_window(sWindow);
-	screen_destroy_context(window->Window.pContext.screenContext);
-	fgError("Could not set window usage");
-	return;
-  }
-
-  /* Could set size based on what is specified for window. Work on another time
-  int size[2];
-  size[0] = w;
-  size[1] = h;
-  if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_BUFFER_SIZE, size)) {
-  	screen_destroy_window(sWindow);
-  	screen_destroy_context(window->Window.pContext.screenContext);
-  	fgError("Could not set window buffer size");
-  	return;
-  }*/
-
-  /* Create window buffers */
-  if (screen_create_window_buffers(sWindow, 2)) {
-	screen_destroy_window(sWindow);
-	screen_destroy_context(window->Window.pContext.screenContext);
-	fgError("Could not create window buffers");
-	return;
-  }
-
-  /* Request window events */
-  screen_request_events(window->Window.pContext.screenContext);
-
-  /* Save window */
-  window->Window.Handle = fgDisplay.pDisplay.single_native_window;
-  window->State.WorkMask |= GLUT_INIT_WORK;
-
-  /* Create context */
-  fghChooseConfig(&window->Window.pContext.egl.Config);
-  window->Window.Context = fghCreateNewContextEGL(window);
-
-  /* Create EGL window */
-  fghPlatformOpenWindowEGL(window);
-
-  window->State.Visible = GL_TRUE;
+#ifndef __X86__
+    screenUsage |= SCREEN_USAGE_DISPLAY; // Physical device copy directly into physical display
+#endif
+    if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_FORMAT, &screenFormat)) {
+        screen_destroy_window(sWindow);
+        fgError("Could not set window format");
+        return;
+    }
+    if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_USAGE, &screenUsage)) {
+        screen_destroy_window(sWindow);
+        fgError("Could not set window usage");
+        return;
+    }
+
+    /* Uncomment when multiple windows are supported
+    int value[2];
+    if(positionUse) {
+        value[0] = x;
+        value[1] = y;
+        if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_POSITION, value)) {
+            screen_destroy_window(sWindow);
+            fgError("Could not set window position");
+            return;
+        }
+    }
+
+    if(sizeUse) {
+        value[0] = w;
+        value[1] = h;
+        if (screen_set_window_property_iv(sWindow, SCREEN_PROPERTY_BUFFER_SIZE, value)) {
+            screen_destroy_window(sWindow);
+            fgError("Could not set window buffer size");
+            return;
+        }
+    }*/
+
+    /* Create window buffers */
+    if (screen_create_window_buffers(sWindow, (fgState.DisplayMode & GLUT_DOUBLE) ? 2 : 1)) {
+        screen_destroy_window(sWindow);
+        fgError("Could not create window buffers");
+        return;
+    }
+
+    /* Save window and set state */
+    window->Window.Handle = fgDisplay.pDisplay.single_native_window;
+    window->State.WorkMask |= GLUT_INIT_WORK;
+    window->State.IsFullscreen = GL_TRUE; //XXX Always fullscreen for now
+
+    /* Create context */
+    fghChooseConfig(&window->Window.pContext.egl.Config);
+    window->Window.Context = fghCreateNewContextEGL(window);
+
+    /* Create EGL window */
+    fghPlatformOpenWindowEGL(window);
+
+    window->State.Visible = GL_TRUE;
 }
 
 /*
@@ -123,7 +127,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
  */
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {
-  fprintf(stderr, "fgPlatformReshapeWindow: STUB\n");
+    fprintf(stderr, "fgPlatformReshapeWindow: STUB\n");
 }
 
 /*
@@ -131,13 +135,9 @@ void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
  */
 void fgPlatformCloseWindow( SFG_Window* window )
 {
-  fghPlatformCloseWindowEGL(window);
-
-  screen_stop_events(window->Window.pContext.screenContext);
+    fghPlatformCloseWindowEGL(window);
 
-  screen_destroy_window((screen_window_t)window->Window.Handle);
-
-  screen_destroy_context(window->Window.pContext.screenContext);
+    screen_destroy_window((screen_window_t)window->Window.Handle);
 }
 
 /*
@@ -145,7 +145,7 @@ void fgPlatformCloseWindow( SFG_Window* window )
  */
 void fgPlatformShowWindow( void )
 {
-  fprintf(stderr, "fgPlatformShowWindow: STUB\n");
+    fprintf(stderr, "fgPlatformShowWindow: STUB\n");
 }
 
 /*
@@ -153,7 +153,7 @@ void fgPlatformShowWindow( void )
  */
 void fgPlatformHideWindow( SFG_Window *window )
 {
-  fprintf(stderr, "fgPlatformHideWindow: STUB\n");
+    fprintf(stderr, "fgPlatformHideWindow: STUB\n");
 }
 
 /*
@@ -161,7 +161,8 @@ void fgPlatformHideWindow( SFG_Window *window )
  */
 void fgPlatformIconifyWindow( SFG_Window *window )
 {
-  fprintf(stderr, "fgPlatformGlutIconifyWindow: STUB\n");
+    //XXX This is possible via Cascades, but can't seem to find a C-level API
+    fprintf(stderr, "fgPlatformGlutIconifyWindow: STUB\n");
 }
 
 /*
@@ -169,7 +170,7 @@ void fgPlatformIconifyWindow( SFG_Window *window )
  */
 void fgPlatformGlutSetWindowTitle( const char* title )
 {
-  fprintf(stderr, "fgPlatformGlutSetWindowTitle: STUB\n");
+    fprintf(stderr, "fgPlatformGlutSetWindowTitle: STUB\n");
 }
 
 /*
@@ -177,14 +178,15 @@ void fgPlatformGlutSetWindowTitle( const char* title )
  */
 void fgPlatformGlutSetIconTitle( const char* title )
 {
-  fprintf(stderr, "fgPlatformGlutSetIconTitle: STUB\n");}
+    fprintf(stderr, "fgPlatformGlutSetIconTitle: STUB\n");
+}
 
 /*
  * Change the specified window's position
  */
 void fgPlatformPositionWindow( SFG_Window *window, int x, int y )
 {
-  fprintf(stderr, "fgPlatformPositionWindow: STUB\n");
+    fprintf(stderr, "fgPlatformPositionWindow: STUB\n");
 }
 
 /*
@@ -192,7 +194,7 @@ void fgPlatformPositionWindow( SFG_Window *window, int x, int y )
  */
 void fgPlatformPushWindow( SFG_Window *window )
 {
-  fprintf(stderr, "fgPlatformPushWindow: STUB\n");
+    fprintf(stderr, "fgPlatformPushWindow: STUB\n");
 }
 
 /*
@@ -200,7 +202,7 @@ void fgPlatformPushWindow( SFG_Window *window )
  */
 void fgPlatformPopWindow( SFG_Window *window )
 {
-  fprintf(stderr, "fgPlatformPopWindow: STUB\n");
+    fprintf(stderr, "fgPlatformPopWindow: STUB\n");
 }
 
 /*
@@ -208,5 +210,5 @@ void fgPlatformPopWindow( SFG_Window *window )
  */
 void fgPlatformFullScreenToggle( SFG_Window *win )
 {
-  fprintf(stderr, "fgPlatformFullScreenToggle: STUB\n");
+    fprintf(stderr, "fgPlatformFullScreenToggle: STUB\n");
 }