Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) From: Eric Wing <ewing2121@yahoo.com> Subject: New OS X patch (was Re: [SDL] Bug with inverted mouse coordinates in I have a new patch for OS X I would like to submit. First, it appears no further action has been taken on my fix from Apple on the OpenGL windowed mode mouse inversion problem. The fix would reunify the code, and no longer require case checking for which version of the OS you are running. This is probably a good fix because the behavior with the old code could change again with future versions of the OS, so those fixes are included in this new patch. But in addition, when I was at Apple, I asked them about the ability to distinguish between the modifier keys on the left and right sides of the keyboard (e.g. Left Shift, Right Shift, Left/Right Alt, L/R Cmd, L/R Ctrl). They told me that starting with Panther, the OS began supporting this feature. This has always been a source of annoyance for me when bringing a program that comes from Windows or Linux to OS X when the keybindings happened to need distinguishable left-side and right-side keys. So the rest of the patch I am submitting contains new code to support this feature on Panther (and presumably later versions of the OS). So after removing the OS version checks for the mouse inversion problem, I reused the OS version checks to activate the Left/Right detection of modifier keys. If you are running Panther (or above), the new code will attempt to distinguish between sides. For the older OS's, the code path reverts to the original code. I've tested with Panther on a G4 Cube, G5 dual processor, and Powerbook Rev C. The Cube and G5 keyboards demonstrated the ability to distinguish between sides. The Powerbook seems to only have left-side keys, but the patch was still able to handle it by producing the same results as before the patch. I also wanted to test a non-Apple keyboard. Unfortunately, I don't have any PC USB keyboards. However, I was able to borrow a Sun Microsystems USB keyboard, so I tried that out on the G5, and I got the correct behavior for left and right sides. I'm expecting that if it worked with a Sun keyboard, most other keyboards should work with no problems.

--- a/src/video/quartz/SDL_QuartzWM.m	Fri Aug 20 22:33:11 2004 +0000
+++ b/src/video/quartz/SDL_QuartzWM.m	Fri Aug 20 22:35:23 2004 +0000
@@ -138,12 +138,8 @@
         p->y = CGDisplayPixelsHigh (display_id) - p->y;
     }
     else {
-        
-        NSPoint newPoint;
-        
-        newPoint = [ window_view convertPoint:*p toView:[ qz_window contentView ] ];
-        
-        *p = newPoint;
+       
+        *p = [ window_view convertPoint:*p toView: nil ];
     }
 }
 
@@ -155,17 +151,11 @@
         p->y = CGDisplayPixelsHigh (display_id) - p->y;
     }
     else {
-        
-        NSPoint newPoint;
-        
-        newPoint = [ window_view convertPoint:*p fromView:[ qz_window contentView ] ];
+
+        *p = [ window_view convertPoint:*p fromView: nil ];
         
-        *p = newPoint;
-
-        /* If OSX version is 10.3.0 or later, we need a workaround in OpenGL mode */
-        if( system_version >= 0x1030 && (SDL_VideoSurface->flags & (SDL_OPENGL | SDL_OPENGLBLIT)) ) {
-            p->y = [window_view frame].size.height - p->y - 1;
-        }
+        /* The coordinates need to be inverted */
+        p->y = [window_view frame].size.height - p->y - 1;
     }
 }