Mercurial > sdl-ios-xcode
view src/video/maccommon/SDL_mackeys.h @ 876:9e84d106ec19
(Said Max Horn on the SDL mailing list...)
Hi folks,
based on Eric Wing's patch, I created the attached patch which fixes
the OpenGL coordinate inversion bug in SDL. It works fine over here on
10.3 with Ryan's test program (which I also attached).
There is another change in it: I removed the "- 1" in the two lines
using CGDisplayPixelsHigh()... while I understand from a logical point
of view why they *should* be correct, I checked the actual values
computed that way, and they were off-by-one. After removing the " - 1",
the returned mouse coordinates are correct. I checked this by moving
the mouse to the screen top/bottom in fullscreen mode, BTW. With the
change, the proper values 0 and 479 are returned (in 640x480 mode).
Sam, you may still want to test on 10.1, it's very simple using Ryan's
minimal test code :-)
Cheers,
Max
(Here is the reproduction case for revision history's sake...)
/*
* To compile:
* gcc -o test test.c `sdl-config --cflags` `sdl-config --libs` -framework OpenGL
*
* --ryan.
*/
#include <stdio.h>
#include "SDL.h"
#include "SDL_opengl.h"
int main(int argc, char **argv)
{
Uint32 flags = SDL_OPENGL /* | SDL_FULLSCREEN */;
SDL_Surface *screen;
SDL_Event event;
int done = 0;
GLfloat ratio;
SDL_Init(SDL_INIT_VIDEO);
SDL_ShowCursor(0);
if ((argv[1]) && (strcmp(argv[1], "--grab") == 0))
SDL_WM_GrabInput(SDL_GRAB_ON);
screen = SDL_SetVideoMode(640, 480, 0, flags);
if (!screen)
return(42);
ratio = ((GLfloat) screen->w) / ((GLfloat) screen->h);
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
glClearDepth( 1.0f );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LEQUAL );
glViewport( 0, 0, screen->w, screen->h);
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
gluPerspective( 45.0f, ratio, 0.1f, 100.0f );
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
SDL_GL_SwapBuffers();
// eh, close enough.
#define MAX_X 6.12
#define MAX_Y 4.50
while (!done)
{
int x, y;
GLfloat glx, gly;
if (!SDL_WaitEvent(&event))
break;
switch (event.type)
{
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE)
done = 1;
break;
}
SDL_GetMouseState(&x, &y);
glx = ((((GLfloat) x) / ((GLfloat) screen->w)) - 0.5f) * MAX_X;
gly = ((((GLfloat) y) / ((GLfloat) screen->h)) - 0.5f) * MAX_Y;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glTranslatef(glx,-gly,-6.0f);
glBegin(GL_TRIANGLES);
glColor3f(1,0,0); glVertex3f( 0.00f, 0.25f, 0.00f);
glColor3f(0,1,0); glVertex3f(-0.25f, -0.25f, 0.00f);
glColor3f(0,0,1); glVertex3f( 0.25f, -0.25f, 0.00f);
glEnd();
SDL_GL_SwapBuffers();
}
SDL_Quit();
return(0);
}
/* end of test.c ... */
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 22 Mar 2004 09:38:20 +0000 |
| parents | b8d311d90021 |
| children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* These are the Macintosh key scancode constants -- from Inside Macintosh */ #define MK_ESCAPE 0x35 #define MK_F1 0x7A #define MK_F2 0x78 #define MK_F3 0x63 #define MK_F4 0x76 #define MK_F5 0x60 #define MK_F6 0x61 #define MK_F7 0x62 #define MK_F8 0x64 #define MK_F9 0x65 #define MK_F10 0x6D #define MK_F11 0x67 #define MK_F12 0x6F #define MK_PRINT 0x69 #define MK_SCROLLOCK 0x6B #define MK_PAUSE 0x71 #define MK_POWER 0x7F #define MK_BACKQUOTE 0x32 #define MK_1 0x12 #define MK_2 0x13 #define MK_3 0x14 #define MK_4 0x15 #define MK_5 0x17 #define MK_6 0x16 #define MK_7 0x1A #define MK_8 0x1C #define MK_9 0x19 #define MK_0 0x1D #define MK_MINUS 0x1B #define MK_EQUALS 0x18 #define MK_BACKSPACE 0x33 #define MK_INSERT 0x72 #define MK_HOME 0x73 #define MK_PAGEUP 0x74 #define MK_NUMLOCK 0x47 #define MK_KP_EQUALS 0x51 #define MK_KP_DIVIDE 0x4B #define MK_KP_MULTIPLY 0x43 #define MK_TAB 0x30 #define MK_q 0x0C #define MK_w 0x0D #define MK_e 0x0E #define MK_r 0x0F #define MK_t 0x11 #define MK_y 0x10 #define MK_u 0x20 #define MK_i 0x22 #define MK_o 0x1F #define MK_p 0x23 #define MK_LEFTBRACKET 0x21 #define MK_RIGHTBRACKET 0x1E #define MK_BACKSLASH 0x2A #define MK_DELETE 0x75 #define MK_END 0x77 #define MK_PAGEDOWN 0x79 #define MK_KP7 0x59 #define MK_KP8 0x5B #define MK_KP9 0x5C #define MK_KP_MINUS 0x4E #define MK_CAPSLOCK 0x39 #define MK_a 0x00 #define MK_s 0x01 #define MK_d 0x02 #define MK_f 0x03 #define MK_g 0x05 #define MK_h 0x04 #define MK_j 0x26 #define MK_k 0x28 #define MK_l 0x25 #define MK_SEMICOLON 0x29 #define MK_QUOTE 0x27 #define MK_RETURN 0x24 #define MK_KP4 0x56 #define MK_KP5 0x57 #define MK_KP6 0x58 #define MK_KP_PLUS 0x45 #define MK_LSHIFT 0x38 #define MK_z 0x06 #define MK_x 0x07 #define MK_c 0x08 #define MK_v 0x09 #define MK_b 0x0B #define MK_n 0x2D #define MK_m 0x2E #define MK_COMMA 0x2B #define MK_PERIOD 0x2F #define MK_SLASH 0x2C #if 0 /* These are the same as the left versions - use left by default */ #define MK_RSHIFT 0x38 #endif #define MK_UP 0x7E #define MK_KP1 0x53 #define MK_KP2 0x54 #define MK_KP3 0x55 #define MK_KP_ENTER 0x4C #define MK_LCTRL 0x3B #define MK_LALT 0x3A #define MK_LMETA 0x37 #define MK_SPACE 0x31 #if 0 /* These are the same as the left versions - use left by default */ #define MK_RMETA 0x37 #define MK_RALT 0x3A #define MK_RCTRL 0x3B #endif #define MK_LEFT 0x7B #define MK_DOWN 0x7D #define MK_RIGHT 0x7C #define MK_KP0 0x52 #define MK_KP_PERIOD 0x41 /* Wierd, these keys are on my iBook under MacOS X */ #define MK_IBOOK_ENTER 0x34 #define MK_IBOOK_LEFT 0x3B #define MK_IBOOK_RIGHT 0x3C #define MK_IBOOK_DOWN 0x3D #define MK_IBOOK_UP 0x3E