Mercurial > sdl-ios-xcode
view src/cdrom/mint/SDL_syscdrom.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 | b8d311d90021 |
children | 604d73db6802 |
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 */ /* Atari MetaDOS CD-ROM functions Patrice Mandin */ #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <cdromio.h> #include <metados.h> #include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" /* Some ioctl() errno values which occur when the tray is empty */ #ifndef ENOMEDIUM #define ENOMEDIUM ENOENT #endif #define ERRNO_TRAYEMPTY(errno) \ ((errno == EIO) || (errno == ENOENT) || \ (errno == EINVAL) || (errno == ENOMEDIUM)) /* The maximum number of CD-ROM drives we'll detect */ #define MAX_DRIVES 32 typedef struct { unsigned char device[3]; /* Physical device letter + ':' + '\0' */ metaopen_t metaopen; /* Infos on opened drive */ } metados_drive_t; static metados_drive_t metados_drives[MAX_DRIVES]; /* The system-dependent CD control functions */ static const char *SDL_SYS_CDName(int drive); static int SDL_SYS_CDOpen(int drive); static void SDL_SYS_CDClose(SDL_CD *cdrom); static int SDL_SYS_CDioctl(int id, int command, void *arg); static int SDL_SYS_CDGetTOC(SDL_CD *cdrom); static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position); static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length); static int SDL_SYS_CDPause(SDL_CD *cdrom); static int SDL_SYS_CDResume(SDL_CD *cdrom); static int SDL_SYS_CDStop(SDL_CD *cdrom); static int SDL_SYS_CDEject(SDL_CD *cdrom); int SDL_SYS_CDInit(void) { metainit_t metainit={0,0,0,0}; metaopen_t metaopen; int i, handle; struct cdrom_subchnl info; Metainit(&metainit); if (metainit.version == NULL) { #ifdef DEBUG_CDROM fprintf(stderr, "MetaDOS not installed\n"); #endif return -1; } if (metainit.drives_map == 0) { #ifdef DEBUG_CDROM fprintf(stderr, "No MetaDOS devices present\n"); #endif return -1; } SDL_numcds = 0; for (i='A'; i<='Z'; i++) { metados_drives[SDL_numcds].device[0] = 0; metados_drives[SDL_numcds].device[1] = ':'; metados_drives[SDL_numcds].device[2] = 0; if (metainit.drives_map & (1<<(i-'A'))) { handle = Metaopen(i, &metaopen); if (handle == 0) { info.cdsc_format = CDROM_MSF; if ( (Metaioctl(i, METADOS_IOCTL_MAGIC, CDROMSUBCHNL, &info) == 0) || ERRNO_TRAYEMPTY(errno) ) { metados_drives[SDL_numcds].device[0] = i; ++SDL_numcds; } Metaclose(i); } } } /* Fill in our driver capabilities */ SDL_CDcaps.Name = SDL_SYS_CDName; SDL_CDcaps.Open = SDL_SYS_CDOpen; SDL_CDcaps.Close = SDL_SYS_CDClose; SDL_CDcaps.GetTOC = SDL_SYS_CDGetTOC; SDL_CDcaps.Status = SDL_SYS_CDStatus; SDL_CDcaps.Play = SDL_SYS_CDPlay; SDL_CDcaps.Pause = SDL_SYS_CDPause; SDL_CDcaps.Resume = SDL_SYS_CDResume; SDL_CDcaps.Stop = SDL_SYS_CDStop; SDL_CDcaps.Eject = SDL_SYS_CDEject; return 0; } void SDL_SYS_CDQuit(void) { SDL_numcds = 0; } static const char *SDL_SYS_CDName(int drive) { return(metados_drives[drive].device); } static int SDL_SYS_CDOpen(int drive) { int handle; handle = Metaopen(metados_drives[drive].device[0], &(metados_drives[drive].metaopen)); if (handle == 0) { return drive; } return -1; } static void SDL_SYS_CDClose(SDL_CD *cdrom) { Metaclose(metados_drives[cdrom->id].device[0]); } static int SDL_SYS_CDioctl(int id, int command, void *arg) { int retval; retval = Metaioctl(metados_drives[id].device[0], METADOS_IOCTL_MAGIC, command, arg); if ( retval < 0 ) { SDL_SetError("ioctl() error: %s", strerror(errno)); } return(retval); } static int SDL_SYS_CDGetTOC(SDL_CD *cdrom) { int i,okay; struct cdrom_tochdr toc; struct cdrom_tocentry entry; /* Use standard ioctl() */ if (SDL_SYS_CDioctl(cdrom->id, CDROMREADTOCHDR, &toc)<0) { return -1; } cdrom->numtracks = toc.cdth_trk1-toc.cdth_trk0+1; if ( cdrom->numtracks > SDL_MAX_TRACKS ) { cdrom->numtracks = SDL_MAX_TRACKS; } /* Read all the track TOC entries */ okay=1; for ( i=0; i<=cdrom->numtracks; ++i ) { if ( i == cdrom->numtracks ) { cdrom->track[i].id = CDROM_LEADOUT; } else { cdrom->track[i].id = toc.cdth_trk0+i; } entry.cdte_track = cdrom->track[i].id; entry.cdte_format = CDROM_MSF; if ( SDL_SYS_CDioctl(cdrom->id, CDROMREADTOCENTRY, &entry) < 0 ) { okay=0; break; } else { if ( entry.cdte_ctrl & CDROM_DATA_TRACK ) { cdrom->track[i].type = SDL_DATA_TRACK; } else { cdrom->track[i].type = SDL_AUDIO_TRACK; } cdrom->track[i].offset = MSF_TO_FRAMES( entry.cdte_addr.msf.minute, entry.cdte_addr.msf.second, entry.cdte_addr.msf.frame); cdrom->track[i].length = 0; if ( i > 0 ) { cdrom->track[i-1].length = cdrom->track[i].offset-cdrom->track[i-1].offset; } } } return(okay ? 0 : -1); } /* Get CD-ROM status */ static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position) { CDstatus status; struct cdrom_tochdr toc; struct cdrom_subchnl info; info.cdsc_format = CDROM_MSF; if ( SDL_SYS_CDioctl(cdrom->id, CDROMSUBCHNL, &info) < 0 ) { if ( ERRNO_TRAYEMPTY(errno) ) { status = CD_TRAYEMPTY; } else { status = CD_ERROR; } } else { switch (info.cdsc_audiostatus) { case CDROM_AUDIO_INVALID: case CDROM_AUDIO_NO_STATUS: /* Try to determine if there's a CD available */ if (SDL_SYS_CDioctl(cdrom->id, CDROMREADTOCHDR, &toc)==0) { status = CD_STOPPED; } else { status = CD_TRAYEMPTY; } break; case CDROM_AUDIO_COMPLETED: status = CD_STOPPED; break; case CDROM_AUDIO_PLAY: status = CD_PLAYING; break; case CDROM_AUDIO_PAUSED: /* Workaround buggy CD-ROM drive */ if ( info.cdsc_trk == CDROM_LEADOUT ) { status = CD_STOPPED; } else { status = CD_PAUSED; } break; default: status = CD_ERROR; break; } } if ( position ) { if ( status == CD_PLAYING || (status == CD_PAUSED) ) { *position = MSF_TO_FRAMES( info.cdsc_absaddr.msf.minute, info.cdsc_absaddr.msf.second, info.cdsc_absaddr.msf.frame); } else { *position = 0; } } return(status); } /* Start play */ static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length) { struct cdrom_msf playtime; FRAMES_TO_MSF(start, &playtime.cdmsf_min0, &playtime.cdmsf_sec0, &playtime.cdmsf_frame0); FRAMES_TO_MSF(start+length, &playtime.cdmsf_min1, &playtime.cdmsf_sec1, &playtime.cdmsf_frame1); #ifdef DEBUG_CDROM fprintf(stderr, "Trying to play from %d:%d:%d to %d:%d:%d\n", playtime.cdmsf_min0, playtime.cdmsf_sec0, playtime.cdmsf_frame0, playtime.cdmsf_min1, playtime.cdmsf_sec1, playtime.cdmsf_frame1); #endif return SDL_SYS_CDioctl(cdrom->id, CDROMPLAYMSF, &playtime); } /* Pause play */ static int SDL_SYS_CDPause(SDL_CD *cdrom) { return SDL_SYS_CDioctl(cdrom->id, CDROMPAUSE, 0); } /* Resume play */ static int SDL_SYS_CDResume(SDL_CD *cdrom) { return SDL_SYS_CDioctl(cdrom->id, CDROMRESUME, 0); } /* Stop play */ static int SDL_SYS_CDStop(SDL_CD *cdrom) { return SDL_SYS_CDioctl(cdrom->id, CDROMSTOP, 0); } /* Eject the CD-ROM */ static int SDL_SYS_CDEject(SDL_CD *cdrom) { return SDL_SYS_CDioctl(cdrom->id, CDROMEJECT, 0); }