Changeset 419 for trunk/orca/gl

Timestamp:

06/28/07 18:40:31 (17 months ago)

Author:

krobillard

Message:

GLV win32 mouse button values now match mac.

Location:

trunk/orca/gl/glv/win32

Files:

• glv.c (modified) (7 diffs)
• glv.h (modified) (2 diffs)

trunk/orca/gl/glv/win32/glv.c

@@ -1 +1 @@
 /*===========================================================================/
 
-  $Id: glv.c,v 1.10 2004/11/11 08:23:58 karl Exp $
-
-  GLV Library
-  Copyright (C) 2003  Karl Robillard
+  GLV Library for Windows
+  Copyright (C) 2003-2007  Karl Robillard
 
 /===========================================================================*/
@@ -89 +87 @@
 
 #define COPY_KEY(ve,t) \
-        _keyLParam = lParam; \
-        _keyWParam = wParam; \
+    _keyLParam = lParam; \
+    _keyWParam = wParam; \
         ve.type  = t; \
         ve.code  = wParam; \
         ve.state = 0; \
-        if( GetKeyState( VK_SHIFT )   & 0x8000 ) ve.state |= GLV_MASK_SHIFT; \
-        if( GetKeyState( VK_CONTROL ) & 0x8000 ) ve.state |= GLV_MASK_CTRL; \
-        if( GetKeyState( VK_MENU )    & 0x8000 ) ve.state |= GLV_MASK_ALT; \
+    if( GetKeyState( VK_SHIFT )   & 0x8000 ) ve.state |= GLV_MASK_SHIFT; \
+    if( GetKeyState( VK_CONTROL ) & 0x8000 ) ve.state |= GLV_MASK_CTRL; \
+    if( GetKeyState( VK_MENU )    & 0x8000 ) ve.state |= GLV_MASK_ALT; \
         ve.x     = 0; \
         ve.y     = 0;
@@ -119 +117 @@
 
         case WM_CLOSE:
-            ve.type = GLV_EVENT_CLOSE;
-            _cv->eventHandler( _cv, &ve );
+            ve.type = GLV_EVENT_CLOSE;
+            _cv->eventHandler( _cv, &ve );
             //PostQuitMessage( 0 );
             break;
@@ -154 +152 @@
                 _cv->height = h;
 
-                ve.type = GLV_EVENT_RESIZE;
-                ve.x    = w;
-                ve.y    = h;
-                _cv->eventHandler( _cv, &ve );
+                ve.type = GLV_EVENT_RESIZE;
+                ve.x    = w;
+                ve.y    = h;
+                _cv->eventHandler( _cv, &ve );
             }
         }
@@ -196 +194 @@
 
             ve.type  = GLV_EVENT_BUTTON_DOWN;
-            ve.code  = message;
+            switch( message )
+            {
+                case WM_LBUTTONDOWN: ve.code = GLV_BUTTON_LEFT;   break;
+                case WM_RBUTTONDOWN: ve.code = GLV_BUTTON_RIGHT;  break;
+                case WM_MBUTTONDOWN: ve.code = GLV_BUTTON_MIDDLE; break;
+                default:             ve.code = 0;                 break;
+            }
             ve.state = LOWORD(wParam);
             ve.x     = LOWORD(lParam);
@@ -212 +216 @@
             switch( message )
             {
-                case WM_LBUTTONUP: ve.code = GLV_BUTTON_LEFT;   break;
-                case WM_RBUTTONUP: ve.code = GLV_BUTTON_RIGHT;  break;
-                case WM_MBUTTONUP: ve.code = GLV_BUTTON_MIDDLE; break;
-                default:           ve.code = 0;                 break;
+                case WM_LBUTTONUP: ve.code = GLV_BUTTON_LEFT;   break;
+                case WM_RBUTTONUP: ve.code = GLV_BUTTON_RIGHT;  break;
+                case WM_MBUTTONUP: ve.code = GLV_BUTTON_MIDDLE; break;
+                default:           ve.code = 0;                 break;
             }
             ve.state = LOWORD(wParam);
@@ -233 +237 @@
 
         case WM_MOUSEWHEEL:
-            ve.type  = GLV_EVENT_WHEEL;
-            ve.code  = 0;
-            ve.state = LOWORD(wParam);
-            ve.x     = 0;
-            ve.y     = (short) HIWORD(wParam);
-            _cv->eventHandler( _cv, &ve );
+            ve.type  = GLV_EVENT_WHEEL;
+            ve.code  = 0;
+            ve.state = LOWORD(wParam);
+            ve.x     = 0;
+            ve.y     = (short) HIWORD(wParam);
+            _cv->eventHandler( _cv, &ve );
 
             //event.setXY( LOWORD(lParam), _displayH - HIWORD(lParam) );

trunk/orca/gl/glv/win32/glv.h

@@ -3 +3 @@
 /*===========================================================================/
 
-  $Id: glv.h,v 1.11 2004/11/13 22:59:42 karl Exp $
-
-  GLV Library
-  Copyright (C) 2003  Karl Robillard
+  GLV Library for Windows
+  Copyright (C) 2003-2007  Karl Robillard
 
 /===========================================================================*/
@@ -85 +83 @@
 
 /* GLViewEvent code for GLV_EVENT_BUTTON_DOWN/UP events */
-#define GLV_BUTTON_LEFT     WM_LBUTTONDOWN
-#define GLV_BUTTON_MIDDLE   WM_MBUTTONDOWN
-#define GLV_BUTTON_RIGHT    WM_RBUTTONDOWN
+#define GLV_BUTTON_LEFT     1
+#define GLV_BUTTON_RIGHT    2
+#define GLV_BUTTON_MIDDLE   3
 
 /* GLViewEvent y for GLV_EVENT_WHEEL events */