X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fblackberry%2Ffg_internal_blackberry.h;h=229ce0539da86ad779486a10350ed4fd20fb18b1;hb=2d252401e5ed48358f8fb2d05be8169309d05eda;hp=02231440155722f377c227f24249bce2630f4dfc;hpb=c7cd43e8ac0fa9dc8d7cb3aa00ab01a0fd3d9967;p=freeglut

diff --git a/src/blackberry/fg_internal_blackberry.h b/src/blackberry/fg_internal_blackberry.h
index 0223144..229ce05 100644
--- a/src/blackberry/fg_internal_blackberry.h
+++ b/src/blackberry/fg_internal_blackberry.h
@@ -32,21 +32,25 @@
 /* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
 /* BlackBerry OpenGL ES is accessed through EGL */
 #include "egl/fg_internal_egl.h"
+#include <screen/screen.h>
+#include <bps/event.h>
 
 /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
 /* The structure used by display initialization in freeglut_init.c */
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {
-  struct tagSFG_PlatformDisplayEGL egl;
-  EGLNativeWindowType single_native_window;
+    struct tagSFG_PlatformDisplayEGL egl;
+    EGLNativeWindowType single_native_window;
 };
 
 typedef struct tagSFG_PlatformContext SFG_PlatformContext;
 /* SFG_PlatformContext is used for SFG_Window.Window */
 struct tagSFG_PlatformContext
 {
-  struct tagSFG_PlatformContextEGL egl;
+    struct tagSFG_PlatformContextEGL egl;
+    screen_context_t screenContext;
+    bps_event_t* event;
 };
 
 
@@ -72,34 +76,34 @@ struct touchscreen {
  * interspersed
  */
 
-  /*
-   * We'll put these values in and that should
-   * allow the code to at least compile when there is
-   * no support. The JS open routine should error out
-   * and shut off all the code downstream anyway and if
-   * the application doesn't use a joystick we'll be fine.
-   */
+/*
+ * We'll put these values in and that should
+ * allow the code to at least compile when there is
+ * no support. The JS open routine should error out
+ * and shut off all the code downstream anyway and if
+ * the application doesn't use a joystick we'll be fine.
+ */
 
-  struct JS_DATA_TYPE
-  {
+struct JS_DATA_TYPE
+{
     int buttons;
     int x;
     int y;
-  };
+};
 
-#            define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+#define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 
 /* XXX It might be better to poll the operating system for the numbers of buttons and
  * XXX axes and then dynamically allocate the arrays.
  */
-#    define _JS_MAX_AXES 16
+#define _JS_MAX_AXES 16
 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
 struct tagSFG_PlatformJoystick
 {
-       struct JS_DATA_TYPE js;
+    struct JS_DATA_TYPE js;
 
-    char         fname [ 128 ];
-    int          fd;
+    char fname [ 128 ];
+    int  fd;
 };
 
 /* Window's state description. This structure should be kept portable. */