X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fblackberry%2Ffg_state_blackberry.c;h=246ba04c6dc57c85bc666b6b58c7efa3fe7609b8;hb=af47c3f93c7834b4006c49ec9df6a6ffdd3025de;hp=27f4968d77939635d57f5b2d24c0c6c1373d0cc8;hpb=2d252401e5ed48358f8fb2d05be8169309d05eda;p=freeglut

diff --git a/src/blackberry/fg_state_blackberry.c b/src/blackberry/fg_state_blackberry.c
index 27f4968..246ba04 100644
--- a/src/blackberry/fg_state_blackberry.c
+++ b/src/blackberry/fg_state_blackberry.c
@@ -35,6 +35,11 @@
 //From fg_state_android.c
 int fgPlatformGlutDeviceGet ( GLenum eWhat )
 {
+#ifndef __PLAYBOOK__
+    int deviceCount, i, value;
+    screen_device_t* devices;
+#endif
+
     switch( eWhat )
     {
     case GLUT_HAS_KEYBOARD:
@@ -42,13 +47,40 @@ int fgPlatformGlutDeviceGet ( GLenum eWhat )
         return 1;
 
     case GLUT_HAS_MOUSE:
-        /* BlackBerry has a touchscreen; until we get proper touchscreen
-           support, consider it as a mouse. */
+        /* BlackBerry has a touchscreen. Consider it as a mouse since we have no guarantee
+           that a mouse will be used (in which case it's a simulator). */
         return 1 ;
 
     case GLUT_NUM_MOUSE_BUTTONS:
-        /* BlackBerry has a touchscreen; until we get proper touchscreen
-           support, consider it as a 1-button mouse. */
+        /* BlackBerry has a touchscreen, which we can consider a 1-button mouse at min.
+           Otherwise check for an actual mouse, else get max touch points. PlayBook does not support this. */
+#ifndef __PLAYBOOK__
+        if(!screen_get_context_property_iv(fgDisplay.pDisplay.screenContext, SCREEN_PROPERTY_DEVICE_COUNT, &deviceCount)) {
+            devices = (screen_device_t*)calloc(deviceCount, sizeof(screen_device_t));
+            if(!screen_get_context_property_pv(fgDisplay.pDisplay.screenContext, SCREEN_PROPERTY_DEVICES, (void**)devices)) {
+                /* Check for a pointer */
+                for(i = 0; i < deviceCount; i++) {
+                    if(!screen_get_device_property_iv(devices[i], SCREEN_PROPERTY_TYPE, &value) &&
+                            value == SCREEN_EVENT_POINTER &&
+                            !screen_get_device_property_iv(devices[i], SCREEN_PROPERTY_BUTTON_COUNT, &value)) {
+                        free(devices);
+                        return value;
+                    }
+                }
+                /* Check for mtouch */
+                for(i = 0; i < deviceCount; i++) {
+                    if(!screen_get_device_property_iv(devices[i], SCREEN_PROPERTY_TYPE, &value) &&
+                            value == SCREEN_EVENT_MTOUCH_TOUCH &&
+                            !screen_get_device_property_iv(devices[i], SCREEN_PROPERTY_MAXIMUM_TOUCH_ID, &value)) {
+                        free(devices);
+                        return value;
+                    }
+                }
+            }
+            free(devices);
+        }
+#endif
+        /* Backup, pretend it's a 1-button mouse */
         return 1;
 
     default:
@@ -75,9 +107,21 @@ int fgPlatformGlutGet ( GLenum eWhat )
     {
         if ( fgStructure.CurrentWindow == NULL )
             return 0;
+
         int size[2];
+        int orientation;
         if ( screen_get_window_property_iv(fgStructure.CurrentWindow->Window.Handle, SCREEN_PROPERTY_BUFFER_SIZE, size) != 0 )
             return 0;
+        if ( screen_get_window_property_iv(fgStructure.CurrentWindow->Window.Handle, SCREEN_PROPERTY_ROTATION, &orientation) != 0 )
+            return 0;
+
+        int orientationDif = abs(orientation - fgStructure.CurrentWindow->State.pWState.originalRotation);
+        if (orientationDif == 90 || orientationDif == 270) {
+            /* Swap dim. if screen is rotated */
+            int tmp = size[0];
+            size[0] = size[1];
+            size[1] = tmp;
+        }
         switch ( eWhat )
         {
         case GLUT_WINDOW_WIDTH: