projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made glutGet, for window width and height, return width and height determined by...
[freeglut]
/
src
/
blackberry
/
fg_internal_blackberry.h
diff --git
a/src/blackberry/fg_internal_blackberry.h
b/src/blackberry/fg_internal_blackberry.h
index
229ce05
..
0756219
100644
(file)
--- a/
src/blackberry/fg_internal_blackberry.h
+++ b/
src/blackberry/fg_internal_blackberry.h
@@
-34,6
+34,7
@@
#include "egl/fg_internal_egl.h"
#include <screen/screen.h>
#include <bps/event.h>
#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 */
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
/* The structure used by display initialization in freeglut_init.c */
@@
-41,6
+42,8
@@
typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
struct tagSFG_PlatformDisplay
{
struct tagSFG_PlatformDisplayEGL egl;
struct tagSFG_PlatformDisplay
{
struct tagSFG_PlatformDisplayEGL egl;
+ screen_context_t screenContext;
+ bps_event_t* event;
EGLNativeWindowType single_native_window;
};
EGLNativeWindowType single_native_window;
};
@@
-49,8
+52,6
@@
typedef struct tagSFG_PlatformContext SFG_PlatformContext;
struct tagSFG_PlatformContext
{
struct tagSFG_PlatformContextEGL egl;
struct tagSFG_PlatformContext
{
struct tagSFG_PlatformContextEGL egl;
- screen_context_t screenContext;
- bps_event_t* event;
};
};
@@
-69,6
+70,9
@@
struct touchscreen {
bool in_mmotion;
};
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 ------------------------------- */
/*
/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
/*
@@
-110,7
+114,11
@@
struct tagSFG_PlatformJoystick
typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
struct tagSFG_PlatformWindowState
{
typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
struct tagSFG_PlatformWindowState
{
- char unused;
+ int newWidth;
+ int newHeight;
+ int originalRotation;
+ navigator_window_state_t windowState;
+ GLboolean windowCovered;
};
/* Menu font and color definitions */
};
/* Menu font and color definitions */