Mercurial > sdl-ios-xcode
annotate test/checkkeys.c @ 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 | 806fcbde0af3 |
children | be9c9c8f6d53 |
rev | line source |
---|---|
0 | 1 |
2 /* Simple program: Loop, watching keystrokes | |
3 Note that you need to call SDL_PollEvent() or SDL_WaitEvent() to | |
4 pump the event loop and catch keystrokes. | |
5 */ | |
6 | |
7 #include <stdio.h> | |
8 #include <stdlib.h> | |
9 #include <string.h> | |
10 | |
11 #include "SDL.h" | |
12 | |
13 static void print_modifiers(void) | |
14 { | |
15 int mod; | |
16 printf(" modifiers:"); | |
17 mod = SDL_GetModState(); | |
18 if(!mod) { | |
19 printf(" (none)"); | |
20 return; | |
21 } | |
22 if(mod & KMOD_LSHIFT) | |
23 printf(" LSHIFT"); | |
24 if(mod & KMOD_RSHIFT) | |
25 printf(" RSHIFT"); | |
26 if(mod & KMOD_LCTRL) | |
27 printf(" LCTRL"); | |
28 if(mod & KMOD_RCTRL) | |
29 printf(" RCTRL"); | |
30 if(mod & KMOD_LALT) | |
31 printf(" LALT"); | |
32 if(mod & KMOD_RALT) | |
33 printf(" RALT"); | |
34 if(mod & KMOD_LMETA) | |
35 printf(" LMETA"); | |
36 if(mod & KMOD_RMETA) | |
37 printf(" RMETA"); | |
38 if(mod & KMOD_NUM) | |
39 printf(" NUM"); | |
40 if(mod & KMOD_CAPS) | |
41 printf(" CAPS"); | |
42 if(mod & KMOD_MODE) | |
43 printf(" MODE"); | |
44 } | |
45 | |
46 static void PrintKey(SDL_keysym *sym, int pressed) | |
47 { | |
48 /* Print the keycode, name and state */ | |
49 if ( sym->sym ) { | |
50 printf("Key %s: %d-%s ", pressed ? "pressed" : "released", | |
51 sym->sym, SDL_GetKeyName(sym->sym)); | |
52 } else { | |
53 printf("Unknown Key (scancode = %d) %s ", sym->scancode, | |
54 pressed ? "pressed" : "released"); | |
55 } | |
56 | |
57 /* Print the translated character, if one exists */ | |
58 if ( sym->unicode ) { | |
59 /* Is it a control-character? */ | |
60 if ( sym->unicode < ' ' ) { | |
61 printf(" (^%c)", sym->unicode+'@'); | |
62 } else { | |
63 #ifdef UNICODE | |
64 printf(" (%c)", sym->unicode); | |
65 #else | |
66 /* This is a Latin-1 program, so only show 8-bits */ | |
67 if ( !(sym->unicode & 0xFF00) ) | |
68 printf(" (%c)", sym->unicode); | |
69 #endif | |
70 } | |
71 } | |
72 print_modifiers(); | |
73 printf("\n"); | |
74 } | |
75 | |
76 int main(int argc, char *argv[]) | |
77 { | |
78 SDL_Event event; | |
79 int done; | |
473 | 80 Uint32 videoflags; |
0 | 81 |
82 /* Initialize SDL */ | |
83 if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) { | |
84 fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); | |
85 exit(1); | |
86 } | |
87 atexit(SDL_Quit); | |
88 | |
473 | 89 videoflags = SDL_SWSURFACE; |
493
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
90 while( argc > 1 ) { |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
91 --argc; |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
92 if ( argv[argc] && !strcmp(argv[argc], "-fullscreen") ) { |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
93 videoflags |= SDL_FULLSCREEN; |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
94 } else { |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
95 fprintf(stderr, "Usage: %s [-fullscreen]\n", argv[0]); |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
96 exit(1); |
806fcbde0af3
Fixed a crash bug in checkkeys.c (thanks John!)
Sam Lantinga <slouken@libsdl.org>
parents:
473
diff
changeset
|
97 } |
473 | 98 } |
99 | |
0 | 100 /* Set 640x480 video mode */ |
473 | 101 if ( SDL_SetVideoMode(640, 480, 0, videoflags) == NULL ) { |
0 | 102 fprintf(stderr, "Couldn't set 640x480 video mode: %s\n", |
103 SDL_GetError()); | |
104 exit(2); | |
105 } | |
106 | |
107 /* Enable UNICODE translation for keyboard input */ | |
108 SDL_EnableUNICODE(1); | |
109 | |
110 /* Enable auto repeat for keyboard input */ | |
111 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, | |
112 SDL_DEFAULT_REPEAT_INTERVAL); | |
113 | |
114 /* Watch keystrokes */ | |
115 done = 0; | |
116 while ( !done ) { | |
117 /* Check for events */ | |
118 SDL_WaitEvent(&event); | |
119 switch (event.type) { | |
120 case SDL_KEYDOWN: | |
121 PrintKey(&event.key.keysym, 1); | |
122 break; | |
123 case SDL_KEYUP: | |
124 PrintKey(&event.key.keysym, 0); | |
125 break; | |
126 case SDL_MOUSEBUTTONDOWN: | |
127 /* Any button press quits the app... */ | |
128 case SDL_QUIT: | |
129 done = 1; | |
130 break; | |
131 default: | |
132 break; | |
133 } | |
134 } | |
135 return(0); | |
136 } |