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

diff --git a/src/blackberry/fg_internal_blackberry.h b/src/blackberry/fg_internal_blackberry.h
index 229ce05..eae1bd9 100644
--- a/src/blackberry/fg_internal_blackberry.h
+++ b/src/blackberry/fg_internal_blackberry.h
@@ -34,13 +34,16 @@
 #include "egl/fg_internal_egl.h"
 #include <screen/screen.h>
 #include <bps/event.h>
+#include <bps/navigator.h>
 
 /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
-/* The structure used by display initialization in freeglut_init.c */
+/* The structure used by display initialization in fg_init.c */
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {
     struct tagSFG_PlatformDisplayEGL egl;
+    screen_context_t screenContext;
+    bps_event_t* event;
     EGLNativeWindowType single_native_window;
 };
 
@@ -49,8 +52,6 @@ typedef struct tagSFG_PlatformContext SFG_PlatformContext;
 struct tagSFG_PlatformContext
 {
     struct tagSFG_PlatformContextEGL egl;
-    screen_context_t screenContext;
-    bps_event_t* event;
 };
 
 
@@ -69,10 +70,13 @@ struct touchscreen {
     bool in_mmotion;
 };
 
+/* -- INPUT DEFINITIONS ---------------------------------------------------- */
+#define WHEEL_DELTA 120 //This is taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms646254(v=vs.85).aspx
+
 
 /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
 /*
- * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
+ * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c"
  * interspersed
  */
 
@@ -110,7 +114,13 @@ struct tagSFG_PlatformJoystick
 typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
 struct tagSFG_PlatformWindowState
 {
-    char unused;
+    int newWidth;
+    int newHeight;
+    int originalRotation;
+    navigator_window_state_t windowState;
+    GLboolean windowCovered;
+    int keyboardHeight;
+    GLboolean keyboardOpen;
 };
 
 /* Menu font and color definitions */