Skip to content

L
libSDL
Commit 483f2ba3 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

indent 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403608
parent 3071101f
Hide whitespace changes
Inline Side-by-side
Showing with 7629 additions and 7690 deletions
XCodeiPhoneOS/Demos/src/keyboard.c
View file @ 483f2ba3
...@@ -174,7 +174,8 @@ void ...@@ -174,7 +174,8 @@ void
drawBlank(int x, int y) drawBlank(int x, int y)
{ {
SDL_Rect rect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN }; SDL_Rect rect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b, bg_color.unused); SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
bg_color.unused);
SDL_RenderFill(&rect); SDL_RenderFill(&rect);
} }
...@@ -254,7 +255,8 @@ main(int argc, char *argv[]) ...@@ -254,7 +255,8 @@ main(int argc, char *argv[])
loadFont(); loadFont();
/* draw the background, we'll just paint over it */ /* draw the background, we'll just paint over it */
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b, bg_color.unused); SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
bg_color.unused);
SDL_RenderFill(NULL); SDL_RenderFill(NULL);
SDL_RenderPresent(); SDL_RenderPresent();
......
XCodeiPhoneOS/Demos/src/mixer.c
View file @ 483f2ba3
...@@ -168,7 +168,7 @@ render(void) ...@@ -168,7 +168,7 @@ render(void)
{ {
int i; int i;
SDL_SetRenderDrawColor(50, 50, 50, 255); SDL_SetRenderDrawColor(50, 50, 50, 255);
SDL_RenderFill(NULL); /* draw background (gray) */ SDL_RenderFill(NULL); /* draw background (gray) */
/* draw the drum buttons */ /* draw the drum buttons */
for (i = 0; i < NUM_DRUMS; i++) { for (i = 0; i < NUM_DRUMS; i++) {
SDL_Color color = SDL_Color color =
......
include/SDL_opengles.h
View file @ 483f2ba3
...@@ -50,7 +50,7 @@ extern "C" ...@@ -50,7 +50,7 @@ extern "C"
#ifndef GL_API #ifndef GL_API
#define GL_API #define GL_API
#endif /* GL_API */ #endif /* GL_API */
/* /*
** License Applicability. Except to the extent portions of this file are ** License Applicability. Except to the extent portions of this file are
...@@ -347,10 +347,10 @@ extern "C" ...@@ -347,10 +347,10 @@ extern "C"
/* OpenGL ES 1.0 defines, they gone in 1.1 and 2.0 */ /* OpenGL ES 1.0 defines, they gone in 1.1 and 2.0 */
#ifndef GL_MAX_ELEMENTS_VERTICES #ifndef GL_MAX_ELEMENTS_VERTICES
#define GL_MAX_ELEMENTS_VERTICES 0x80E8 #define GL_MAX_ELEMENTS_VERTICES 0x80E8
#endif /* GL_MAX_ELEMENTS_VERTICES */ #endif /* GL_MAX_ELEMENTS_VERTICES */
#ifndef GL_MAX_ELEMENTS_INDICES #ifndef GL_MAX_ELEMENTS_INDICES
#define GL_MAX_ELEMENTS_INDICES 0x80E9 #define GL_MAX_ELEMENTS_INDICES 0x80E9
#endif /* GL_MAX_ELEMENTS_INDICES */ #endif /* GL_MAX_ELEMENTS_INDICES */
/* GetTextureParameter */ /* GetTextureParameter */
/* GL_TEXTURE_MAG_FILTER */ /* GL_TEXTURE_MAG_FILTER */
...@@ -669,7 +669,7 @@ extern "C" ...@@ -669,7 +669,7 @@ extern "C"
/* GL_OES_draw_texture */ /* GL_OES_draw_texture */
#ifndef GL_OES_draw_texture #ifndef GL_OES_draw_texture
#define GL_TEXTURE_CROP_RECT_OES 0x8B9D #define GL_TEXTURE_CROP_RECT_OES 0x8B9D
#endif /* GL_OES_draw_texture */ #endif /* GL_OES_draw_texture */
/* GL_OES_vertex_buffer_object */ /* GL_OES_vertex_buffer_object */
#ifndef GL_OES_vertex_buffer_object #ifndef GL_OES_vertex_buffer_object
...@@ -687,7 +687,7 @@ extern "C" ...@@ -687,7 +687,7 @@ extern "C"
#define GL_BUFFER_SIZE_OES 0x8764 #define GL_BUFFER_SIZE_OES 0x8764
#define GL_BUFFER_USAGE_OES 0x8765 #define GL_BUFFER_USAGE_OES 0x8765
#define GL_BUFFER_ACCESS_OES 0x88BB #define GL_BUFFER_ACCESS_OES 0x88BB
#endif /* GL_OES_vertex_buffer_object */ #endif /* GL_OES_vertex_buffer_object */
/*************************************************************/ /*************************************************************/
...@@ -973,8 +973,9 @@ extern "C" ...@@ -973,8 +973,9 @@ extern "C"
/* GL_OES_query_matrix */ /* GL_OES_query_matrix */
#ifndef GL_OES_query_matrix #ifndef GL_OES_query_matrix
#define GL_OES_query_matrix 1 #define GL_OES_query_matrix 1
GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16],
#endif /* GL_OES_query_matrix */ GLint exponent[16]);
#endif /* GL_OES_query_matrix */
/* GL_OES_point_sprite */ /* GL_OES_point_sprite */
#ifndef GL_OES_point_sprite #ifndef GL_OES_point_sprite
...@@ -984,26 +985,35 @@ extern "C" ...@@ -984,26 +985,35 @@ extern "C"
/* GL_OES_draw_texture */ /* GL_OES_draw_texture */
#ifndef GL_OES_draw_texture #ifndef GL_OES_draw_texture
#define GL_OES_draw_texture 1 #define GL_OES_draw_texture 1
GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); GL_API void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z,
GL_API void GL_APIENTRY glDrawTexiOES (GLint x, GLint y, GLint z, GLint width, GLint height); GLshort width, GLshort height);
GL_API void GL_APIENTRY glDrawTexxOES (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); GL_API void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z,
GL_API void GL_APIENTRY glDrawTexsvOES (const GLshort *coords); GLint width, GLint height);
GL_API void GL_APIENTRY glDrawTexivOES (const GLint *coords); GL_API void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z,
GL_API void GL_APIENTRY glDrawTexxvOES (const GLfixed *coords); GLfixed width, GLfixed height);
GL_API void GL_APIENTRY glDrawTexfOES (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); GL_API void GL_APIENTRY glDrawTexsvOES(const GLshort * coords);
GL_API void GL_APIENTRY glDrawTexfvOES (const GLfloat *coords); GL_API void GL_APIENTRY glDrawTexivOES(const GLint * coords);
#endif /* GL_OES_draw_texture */ GL_API void GL_APIENTRY glDrawTexxvOES(const GLfixed * coords);
GL_API void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height);
GL_API void GL_APIENTRY glDrawTexfvOES(const GLfloat * coords);
#endif /* GL_OES_draw_texture */
/* GL_OES_single_precision */ /* GL_OES_single_precision */
#ifndef GL_OES_single_precision #ifndef GL_OES_single_precision
#define GL_OES_single_precision 1 #define GL_OES_single_precision 1
GL_API void GL_APIENTRY glDepthRangefOES (GLclampf zNear, GLclampf zFar); GL_API void GL_APIENTRY glDepthRangefOES(GLclampf zNear, GLclampf zFar);
GL_API void GL_APIENTRY glFrustumfOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); GL_API void GL_APIENTRY glFrustumfOES(GLfloat left, GLfloat right,
GL_API void GL_APIENTRY glOrthofOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); GLfloat bottom, GLfloat top,
GL_API void GL_APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation); GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glGetClipPlanefOES (GLenum pname, GLfloat eqn[4]); GL_API void GL_APIENTRY glOrthofOES(GLfloat left, GLfloat right,
GL_API void GL_APIENTRY glClearDepthfOES (GLclampf depth); GLfloat bottom, GLfloat top,
#endif /* GL_OES_single_precision */ GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glClipPlanefOES(GLenum plane,
const GLfloat * equation);
GL_API void GL_APIENTRY glGetClipPlanefOES(GLenum pname, GLfloat eqn[4]);
GL_API void GL_APIENTRY glClearDepthfOES(GLclampf depth);
#endif /* GL_OES_single_precision */
/* GL_OES_vertex_buffer_object */ /* GL_OES_vertex_buffer_object */
#ifndef GL_OES_vertex_buffer_object #ifndef GL_OES_vertex_buffer_object
...@@ -1012,10 +1022,12 @@ extern "C" ...@@ -1012,10 +1022,12 @@ extern "C"
GL_API void APIENTRY glDeleteBuffersOES(GLsizei, const GLuint *); GL_API void APIENTRY glDeleteBuffersOES(GLsizei, const GLuint *);
GL_API void APIENTRY glGenBuffersOES(GLsizei, GLuint *); GL_API void APIENTRY glGenBuffersOES(GLsizei, GLuint *);
GL_API GLboolean APIENTRY glIsBufferOES(GLuint); GL_API GLboolean APIENTRY glIsBufferOES(GLuint);
GL_API void APIENTRY glBufferDataOES(GLenum, GLsizeiptr, const GLvoid *, GLenum); GL_API void APIENTRY glBufferDataOES(GLenum, GLsizeiptr, const GLvoid *,
GL_API void APIENTRY glBufferSubDataOES(GLenum, GLintptr, GLsizeiptr, const GLvoid *); GLenum);
GL_API void APIENTRY glBufferSubDataOES(GLenum, GLintptr, GLsizeiptr,
const GLvoid *);
GL_API void APIENTRY glGetBufferParameterivOES(GLenum, GLenum, GLint *); GL_API void APIENTRY glGetBufferParameterivOES(GLenum, GLenum, GLint *);
#endif /* GL_OES_vertex_buffer_object */ #endif /* GL_OES_vertex_buffer_object */
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/SDL_video.h
View file @ 483f2ba3
...@@ -271,8 +271,8 @@ typedef enum ...@@ -271,8 +271,8 @@ typedef enum
SDL_GL_MULTISAMPLESAMPLES, SDL_GL_MULTISAMPLESAMPLES,
SDL_GL_ACCELERATED_VISUAL, SDL_GL_ACCELERATED_VISUAL,
SDL_GL_RETAINED_BACKING, SDL_GL_RETAINED_BACKING,
SDL_GL_CONTEXT_MAJOR_VERSION, SDL_GL_CONTEXT_MAJOR_VERSION,
SDL_GL_CONTEXT_MINOR_VERSION SDL_GL_CONTEXT_MINOR_VERSION
} SDL_GLattr; } SDL_GLattr;
......
src/SDL_compat.c
View file @ 483f2ba3
...@@ -494,7 +494,7 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) ...@@ -494,7 +494,7 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
return NULL; return NULL;
} }
} }
SDL_GetDesktopDisplayMode(&desktop_mode); SDL_GetDesktopDisplayMode(&desktop_mode);
if (width == 0) { if (width == 0) {
......
src/audio/SDL_audio.c
View file @ 483f2ba3
...@@ -477,7 +477,8 @@ SDL_RunAudio(void *devicep) ...@@ -477,7 +477,8 @@ SDL_RunAudio(void *devicep)
/* Wait for an audio buffer to become available */ /* Wait for an audio buffer to become available */
current_audio.impl.WaitDevice(device); current_audio.impl.WaitDevice(device);
} else { } else {
SDL_Delay((device->spec.samples * 1000) / device->spec.freq); SDL_Delay((device->spec.samples * 1000) /
device->spec.freq);
} }
} }
...@@ -525,7 +526,7 @@ SDL_RunAudio(void *devicep) ...@@ -525,7 +526,7 @@ SDL_RunAudio(void *devicep)
/* Wait for an audio buffer to become available */ /* Wait for an audio buffer to become available */
current_audio.impl.WaitDevice(device); current_audio.impl.WaitDevice(device);
} else { } else {
SDL_Delay((device->spec.samples * 1000) / device->spec.freq); SDL_Delay((device->spec.samples * 1000) / device->spec.freq);
} }
} }
} }
......
src/audio/qsa/SDL_qsa_audio.c
View file @ 483f2ba3
...@@ -59,888 +59,840 @@ ...@@ -59,888 +59,840 @@
struct BuggyCards struct BuggyCards
{ {
char* cardname; char *cardname;
unsigned long bugtype; unsigned long bugtype;
}; };
#define QSA_WA_CARDS 3 #define QSA_WA_CARDS 3
#define QSA_MAX_CARD_NAME_LENGTH 33 #define QSA_MAX_CARD_NAME_LENGTH 33
struct BuggyCards buggycards[QSA_WA_CARDS]= struct BuggyCards buggycards[QSA_WA_CARDS] = {
{ {"Sound Blaster Live!", QSA_MMAP_WORKAROUND},
{"Sound Blaster Live!", QSA_MMAP_WORKAROUND}, {"Vortex 8820", QSA_MMAP_WORKAROUND},
{"Vortex 8820", QSA_MMAP_WORKAROUND}, {"Vortex 8830", QSA_MMAP_WORKAROUND},
{"Vortex 8830", QSA_MMAP_WORKAROUND},
}; };
/* List of found devices */ /* List of found devices */
#define QSA_MAX_DEVICES 32 #define QSA_MAX_DEVICES 32
#define QSA_MAX_NAME_LENGTH 81+16 /* Hardcoded in QSA, can't be changed */ #define QSA_MAX_NAME_LENGTH 81+16 /* Hardcoded in QSA, can't be changed */
typedef struct _QSA_Device typedef struct _QSA_Device
{ {
char name[QSA_MAX_NAME_LENGTH]; /* Long audio device name for SDL */ char name[QSA_MAX_NAME_LENGTH]; /* Long audio device name for SDL */
int cardno; int cardno;
int deviceno; int deviceno;
} QSA_Device; } QSA_Device;
QSA_Device qsa_playback_device[QSA_MAX_DEVICES]; QSA_Device qsa_playback_device[QSA_MAX_DEVICES];
uint32_t qsa_playback_devices; uint32_t qsa_playback_devices;
QSA_Device qsa_capture_device[QSA_MAX_DEVICES]; QSA_Device qsa_capture_device[QSA_MAX_DEVICES];
uint32_t qsa_capture_devices; uint32_t qsa_capture_devices;
static inline void QSA_SetError(const char* fn, int status) static inline void
QSA_SetError(const char *fn, int status)
{ {
SDL_SetError("QSA: %s() failed: %s", fn, snd_strerror(status)); SDL_SetError("QSA: %s() failed: %s", fn, snd_strerror(status));
} }
/* card names check to apply the workarounds */ /* card names check to apply the workarounds */
static int QSA_CheckBuggyCards(_THIS, unsigned long checkfor) static int
QSA_CheckBuggyCards(_THIS, unsigned long checkfor)
{ {
char scardname[QSA_MAX_CARD_NAME_LENGTH]; char scardname[QSA_MAX_CARD_NAME_LENGTH];
int it; int it;
if (snd_card_get_name(this->hidden->cardno, scardname, QSA_MAX_CARD_NAME_LENGTH-1)<0) if (snd_card_get_name
{ (this->hidden->cardno, scardname, QSA_MAX_CARD_NAME_LENGTH - 1) < 0) {
return 0; return 0;
} }
for (it=0; it<QSA_WA_CARDS; it++) for (it = 0; it < QSA_WA_CARDS; it++) {
{ if (SDL_strcmp(buggycards[it].cardname, scardname) == 0) {
if (SDL_strcmp(buggycards[it].cardname, scardname)==0) if (buggycards[it].bugtype == checkfor) {
{ return 1;
if (buggycards[it].bugtype==checkfor) }
{ }
return 1; }
}
} return 0;
}
return 0;
} }
static void QSA_ThreadInit(_THIS) static void
QSA_ThreadInit(_THIS)
{ {
struct sched_param param; struct sched_param param;
int status; int status;
/* Increase default 10 priority to 25 to avoid jerky sound */ /* Increase default 10 priority to 25 to avoid jerky sound */
status=SchedGet(0, 0, &param); status = SchedGet(0, 0, &param);
param.sched_priority=param.sched_curpriority + 15; param.sched_priority = param.sched_curpriority + 15;
status=SchedSet(0, 0, SCHED_NOCHANGE, &param); status = SchedSet(0, 0, SCHED_NOCHANGE, &param);
} }
/* PCM channel parameters initialize function */ /* PCM channel parameters initialize function */
static void QSA_InitAudioParams(snd_pcm_channel_params_t* cpars) static void
QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
{ {
SDL_memset(cpars, 0, sizeof(snd_pcm_channel_params_t)); SDL_memset(cpars, 0, sizeof(snd_pcm_channel_params_t));
cpars->channel=SND_PCM_CHANNEL_PLAYBACK; cpars->channel = SND_PCM_CHANNEL_PLAYBACK;
cpars->mode=SND_PCM_MODE_BLOCK; cpars->mode = SND_PCM_MODE_BLOCK;
cpars->start_mode=SND_PCM_START_DATA; cpars->start_mode = SND_PCM_START_DATA;
cpars->stop_mode=SND_PCM_STOP_STOP; cpars->stop_mode = SND_PCM_STOP_STOP;
cpars->format.format=SND_PCM_SFMT_S16_LE; cpars->format.format = SND_PCM_SFMT_S16_LE;
cpars->format.interleave=1; cpars->format.interleave = 1;
cpars->format.rate=DEFAULT_CPARAMS_RATE; cpars->format.rate = DEFAULT_CPARAMS_RATE;
cpars->format.voices=DEFAULT_CPARAMS_VOICES; cpars->format.voices = DEFAULT_CPARAMS_VOICES;
cpars->buf.block.frag_size=DEFAULT_CPARAMS_FRAG_SIZE; cpars->buf.block.frag_size = DEFAULT_CPARAMS_FRAG_SIZE;
cpars->buf.block.frags_min=DEFAULT_CPARAMS_FRAGS_MIN; cpars->buf.block.frags_min = DEFAULT_CPARAMS_FRAGS_MIN;
cpars->buf.block.frags_max=DEFAULT_CPARAMS_FRAGS_MAX; cpars->buf.block.frags_max = DEFAULT_CPARAMS_FRAGS_MAX;
} }
/* This function waits until it is possible to write a full sound buffer */ /* This function waits until it is possible to write a full sound buffer */
static void QSA_WaitDevice(_THIS) static void
QSA_WaitDevice(_THIS)
{ {
fd_set wfds; fd_set wfds;
fd_set rfds; fd_set rfds;
int selectret; int selectret;
struct timeval timeout; struct timeval timeout;
if (!this->hidden->iscapture) if (!this->hidden->iscapture) {
{ FD_ZERO(&wfds);
FD_ZERO(&wfds); FD_SET(this->hidden->audio_fd, &wfds);
FD_SET(this->hidden->audio_fd, &wfds); } else {
} FD_ZERO(&rfds);
else FD_SET(this->hidden->audio_fd, &rfds);
{ }
FD_ZERO(&rfds);
FD_SET(this->hidden->audio_fd, &rfds); do {
} /* Setup timeout for playing one fragment equal to 2 seconds */
/* If timeout occured than something wrong with hardware or driver */
do { /* For example, Vortex 8820 audio driver stucks on second DAC because */
/* Setup timeout for playing one fragment equal to 2 seconds */ /* it doesn't exist ! */
/* If timeout occured than something wrong with hardware or driver */ timeout.tv_sec = 2;
/* For example, Vortex 8820 audio driver stucks on second DAC because */ timeout.tv_usec = 0;
/* it doesn't exist ! */ this->hidden->timeout_on_wait = 0;
timeout.tv_sec=2;
timeout.tv_usec=0; if (!this->hidden->iscapture) {
this->hidden->timeout_on_wait=0; selectret =
select(this->hidden->audio_fd + 1, NULL, &wfds, NULL,
if (!this->hidden->iscapture) &timeout);
{ } else {
selectret=select(this->hidden->audio_fd+1, NULL, &wfds, NULL, &timeout); selectret =
} select(this->hidden->audio_fd + 1, &rfds, NULL, NULL,
else &timeout);
{ }
selectret=select(this->hidden->audio_fd+1, &rfds, NULL, NULL, &timeout);
} switch (selectret) {
case -1:
switch(selectret) {
{ SDL_SetError("QSA: select() failed: %s\n", strerror(errno));
case -1: return;
{ }
SDL_SetError("QSA: select() failed: %s\n", strerror(errno)); break;
return; case 0:
} {
break; SDL_SetError("QSA: timeout on buffer waiting occured\n");
case 0: this->hidden->timeout_on_wait = 1;
{ return;
SDL_SetError("QSA: timeout on buffer waiting occured\n"); }
this->hidden->timeout_on_wait=1; break;
return; default:
} {
break; if (!this->hidden->iscapture) {
default: if (FD_ISSET(this->hidden->audio_fd, &wfds)) {
{ return;
if (!this->hidden->iscapture)
{
if (FD_ISSET(this->hidden->audio_fd, &wfds))
{
return;
} }
} } else {
else if (FD_ISSET(this->hidden->audio_fd, &rfds)) {
{ return;
if (FD_ISSET(this->hidden->audio_fd, &rfds))
{
return;
} }
} }
} }
break; break;
} }
} while (1); } while (1);
} }
static void QSA_PlayDevice(_THIS) static void
QSA_PlayDevice(_THIS)
{ {
snd_pcm_channel_status_t cstatus; snd_pcm_channel_status_t cstatus;
int written; int written;
int status; int status;
int towrite; int towrite;
void* pcmbuffer; void *pcmbuffer;
if ((!this->enabled) || (!this->hidden)) if ((!this->enabled) || (!this->hidden)) {
{ return;
return; }
}
towrite = this->spec.size;
towrite = this->spec.size; pcmbuffer = this->hidden->pcm_buf;
pcmbuffer = this->hidden->pcm_buf;
/* Write the audio data, checking for EAGAIN (buffer full) and underrun */
/* Write the audio data, checking for EAGAIN (buffer full) and underrun */ do {
do { written =
written=snd_pcm_plugin_write(this->hidden->audio_handle, pcmbuffer, towrite); snd_pcm_plugin_write(this->hidden->audio_handle, pcmbuffer,
if (written!=towrite) towrite);
{ if (written != towrite) {
/* Check if samples playback got stuck somewhere in hardware or in */ /* Check if samples playback got stuck somewhere in hardware or in */
/* the audio device driver */ /* the audio device driver */
if ((errno==EAGAIN) && (written==0)) if ((errno == EAGAIN) && (written == 0)) {
{ if (this->hidden->timeout_on_wait != 0) {
if (this->hidden->timeout_on_wait!=0) SDL_SetError("QSA: buffer playback timeout\n");
{ return;
SDL_SetError("QSA: buffer playback timeout\n"); }
return;
}
}
/* Check for errors or conditions */
if ((errno==EAGAIN)||(errno==EWOULDBLOCK))
{
/* Let a little CPU time go by and try to write again */
SDL_Delay(1);
/* if we wrote some data */
towrite-=written;
pcmbuffer+=written*this->spec.channels;
continue;
}
else
{
if ((errno==EINVAL)||(errno==EIO))
{
SDL_memset(&cstatus, 0, sizeof(cstatus));
if (!this->hidden->iscapture)
{
cstatus.channel=SND_PCM_CHANNEL_PLAYBACK;
}
else
{
cstatus.channel=SND_PCM_CHANNEL_CAPTURE;
}
status=snd_pcm_plugin_status(this->hidden->audio_handle, &cstatus);
if (status<0)
{
QSA_SetError("snd_pcm_plugin_status", status);
return;
}
if ((cstatus.status==SND_PCM_STATUS_UNDERRUN) ||
(cstatus.status==SND_PCM_STATUS_READY))
{
if (!this->hidden->iscapture)
{
status=snd_pcm_plugin_prepare(this->hidden->audio_handle,
SND_PCM_CHANNEL_PLAYBACK);
}
else
{
status=snd_pcm_plugin_prepare(this->hidden->audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
if (status<0)
{
QSA_SetError("snd_pcm_plugin_prepare", status);
return;
}
}
continue;
} }
else
{ /* Check for errors or conditions */
return; if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {
/* Let a little CPU time go by and try to write again */
SDL_Delay(1);
/* if we wrote some data */
towrite -= written;
pcmbuffer += written * this->spec.channels;
continue;
} else {
if ((errno == EINVAL) || (errno == EIO)) {
SDL_memset(&cstatus, 0, sizeof(cstatus));
if (!this->hidden->iscapture) {
cstatus.channel = SND_PCM_CHANNEL_PLAYBACK;
} else {
cstatus.channel = SND_PCM_CHANNEL_CAPTURE;
}
status =
snd_pcm_plugin_status(this->hidden->audio_handle,
&cstatus);
if (status < 0) {
QSA_SetError("snd_pcm_plugin_status", status);
return;
}
if ((cstatus.status == SND_PCM_STATUS_UNDERRUN) ||
(cstatus.status == SND_PCM_STATUS_READY)) {
if (!this->hidden->iscapture) {
status =
snd_pcm_plugin_prepare(this->hidden->
audio_handle,
SND_PCM_CHANNEL_PLAYBACK);
} else {
status =
snd_pcm_plugin_prepare(this->hidden->
audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
if (status < 0) {
QSA_SetError("snd_pcm_plugin_prepare", status);
return;
}
}
continue;
} else {
return;
}
} }
} } else {
} /* we wrote all remaining data */
else towrite -= written;
{ pcmbuffer += written * this->spec.channels;
/* we wrote all remaining data */ }
towrite -= written; } while ((towrite > 0) && (this->enabled));
pcmbuffer += written * this->spec.channels;
} /* If we couldn't write, assume fatal error for now */
} while ((towrite>0) && (this->enabled)); if (towrite != 0) {
this->enabled = 0;
/* If we couldn't write, assume fatal error for now */ }
if (towrite!=0)
{
this->enabled=0;
}
} }
static Uint8* QSA_GetDeviceBuf(_THIS) static Uint8 *
QSA_GetDeviceBuf(_THIS)
{ {
return this->hidden->pcm_buf; return this->hidden->pcm_buf;
} }
static void QSA_CloseDevice(_THIS) static void
QSA_CloseDevice(_THIS)
{ {
if (this->hidden!=NULL) if (this->hidden != NULL) {
{ if (this->hidden->audio_handle != NULL) {
if (this->hidden->audio_handle!=NULL) if (!this->hidden->iscapture) {
{ /* Finish playing available samples */
if (!this->hidden->iscapture) snd_pcm_plugin_flush(this->hidden->audio_handle,
{ SND_PCM_CHANNEL_PLAYBACK);
/* Finish playing available samples */ } else {
snd_pcm_plugin_flush(this->hidden->audio_handle, SND_PCM_CHANNEL_PLAYBACK); /* Cancel unread samples during capture */
} snd_pcm_plugin_flush(this->hidden->audio_handle,
else SND_PCM_CHANNEL_CAPTURE);
{ }
/* Cancel unread samples during capture */ snd_pcm_close(this->hidden->audio_handle);
snd_pcm_plugin_flush(this->hidden->audio_handle, SND_PCM_CHANNEL_CAPTURE); this->hidden->audio_handle = NULL;
} }
snd_pcm_close(this->hidden->audio_handle);
this->hidden->audio_handle=NULL; if (this->hidden->pcm_buf != NULL) {
} SDL_FreeAudioMem(this->hidden->pcm_buf);
this->hidden->pcm_buf = NULL;
if (this->hidden->pcm_buf!=NULL) }
{
SDL_FreeAudioMem(this->hidden->pcm_buf); SDL_free(this->hidden);
this->hidden->pcm_buf=NULL; this->hidden = NULL;
} }
SDL_free(this->hidden);
this->hidden=NULL;
}
} }
static int QSA_OpenDevice(_THIS, const char* devname, int iscapture) static int
QSA_OpenDevice(_THIS, const char *devname, int iscapture)
{ {
int status=0; int status = 0;
int format=0; int format = 0;
SDL_AudioFormat test_format=0; SDL_AudioFormat test_format = 0;
int found=0; int found = 0;
snd_pcm_channel_setup_t csetup; snd_pcm_channel_setup_t csetup;
snd_pcm_channel_params_t cparams; snd_pcm_channel_params_t cparams;
/* Initialize all variables that we clean on shutdown */ /* Initialize all variables that we clean on shutdown */
this->hidden=(struct SDL_PrivateAudioData*)SDL_calloc(1, (sizeof(struct SDL_PrivateAudioData))); this->hidden =
if (this->hidden==NULL) (struct SDL_PrivateAudioData *) SDL_calloc(1,
{ (sizeof
SDL_OutOfMemory(); (struct
return 0; SDL_PrivateAudioData)));
} if (this->hidden == NULL) {
SDL_memset(this->hidden, 0, sizeof(struct SDL_PrivateAudioData)); SDL_OutOfMemory();
return 0;
/* Initialize channel transfer parameters to default */ }
QSA_InitAudioParams(&cparams); SDL_memset(this->hidden, 0, sizeof(struct SDL_PrivateAudioData));
/* Initialize channel direction: capture or playback */ /* Initialize channel transfer parameters to default */
this->hidden->iscapture=iscapture; QSA_InitAudioParams(&cparams);
/* Find deviceid and cardid by device name for playback */ /* Initialize channel direction: capture or playback */
if ((!this->hidden->iscapture) && (devname!=NULL)) this->hidden->iscapture = iscapture;
{
uint32_t device; /* Find deviceid and cardid by device name for playback */
int32_t status; if ((!this->hidden->iscapture) && (devname != NULL)) {
uint32_t device;
/* Search in the playback devices */ int32_t status;
device=0;
do { /* Search in the playback devices */
status=SDL_strcmp(qsa_playback_device[device].name, devname); device = 0;
if (status==0) do {
{ status = SDL_strcmp(qsa_playback_device[device].name, devname);
/* Found requested device */ if (status == 0) {
this->hidden->deviceno=qsa_playback_device[device].deviceno; /* Found requested device */
this->hidden->cardno=qsa_playback_device[device].cardno; this->hidden->deviceno = qsa_playback_device[device].deviceno;
break; this->hidden->cardno = qsa_playback_device[device].cardno;
} break;
device++; }
if (device>=qsa_playback_devices) device++;
{ if (device >= qsa_playback_devices) {
QSA_CloseDevice(this);
SDL_SetError("No such playback device");
return 0;
}
} while (1);
}
/* Find deviceid and cardid by device name for capture */
if ((this->hidden->iscapture) && (devname != NULL)) {
/* Search in the capture devices */
uint32_t device;
int32_t status;
/* Searching in the playback devices */
device = 0;
do {
status = SDL_strcmp(qsa_capture_device[device].name, devname);
if (status == 0) {
/* Found requested device */
this->hidden->deviceno = qsa_capture_device[device].deviceno;
this->hidden->cardno = qsa_capture_device[device].cardno;
break;
}
device++;
if (device >= qsa_capture_devices) {
QSA_CloseDevice(this);
SDL_SetError("No such capture device");
return 0;
}
} while (1);
}
/* Check if SDL requested default audio device */
if (devname == NULL) {
/* Open system default audio device */
if (!this->hidden->iscapture) {
status = snd_pcm_open_preferred(&this->hidden->audio_handle,
&this->hidden->cardno,
&this->hidden->deviceno,
SND_PCM_OPEN_PLAYBACK);
} else {
status = snd_pcm_open_preferred(&this->hidden->audio_handle,
&this->hidden->cardno,
&this->hidden->deviceno,
SND_PCM_OPEN_CAPTURE);
}
} else {
/* Open requested audio device */
if (!this->hidden->iscapture) {
status =
snd_pcm_open(&this->hidden->audio_handle,
this->hidden->cardno, this->hidden->deviceno,
SND_PCM_OPEN_PLAYBACK);
} else {
status =
snd_pcm_open(&this->hidden->audio_handle,
this->hidden->cardno, this->hidden->deviceno,
SND_PCM_OPEN_CAPTURE);
}
}
/* Check if requested device is opened */
if (status < 0) {
this->hidden->audio_handle = NULL;
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_open", status);
return 0;
}
if (!QSA_CheckBuggyCards(this, QSA_MMAP_WORKAROUND)) {
/* Disable QSA MMAP plugin for buggy audio drivers */
status =
snd_pcm_plugin_set_disable(this->hidden->audio_handle,
PLUGIN_DISABLE_MMAP);
if (status < 0) {
QSA_CloseDevice(this); QSA_CloseDevice(this);
SDL_SetError("No such playback device"); QSA_SetError("snd_pcm_plugin_set_disable", status);
return 0; return 0;
} }
} while(1); }
}
/* Try for a closest match on audio format */
/* Find deviceid and cardid by device name for capture */ format = 0;
if ((this->hidden->iscapture) && (devname!=NULL)) /* can't use format as SND_PCM_SFMT_U8 = 0 in qsa */
{ found = 0;
/* Search in the capture devices */
uint32_t device; for (test_format = SDL_FirstAudioFormat(this->spec.format); !found;) {
int32_t status; /* if match found set format to equivalent QSA format */
switch (test_format) {
/* Searching in the playback devices */ case AUDIO_U8:
device=0; {
do { format = SND_PCM_SFMT_U8;
status=SDL_strcmp(qsa_capture_device[device].name, devname); found = 1;
if (status==0) }
{
/* Found requested device */
this->hidden->deviceno=qsa_capture_device[device].deviceno;
this->hidden->cardno=qsa_capture_device[device].cardno;
break; break;
} case AUDIO_S8:
device++;
if (device>=qsa_capture_devices)
{
QSA_CloseDevice(this);
SDL_SetError("No such capture device");
return 0;
}
} while(1);
}
/* Check if SDL requested default audio device */
if (devname==NULL)
{
/* Open system default audio device */
if (!this->hidden->iscapture)
{
status=snd_pcm_open_preferred(&this->hidden->audio_handle,
&this->hidden->cardno,
&this->hidden->deviceno, SND_PCM_OPEN_PLAYBACK);
}
else
{
status=snd_pcm_open_preferred(&this->hidden->audio_handle,
&this->hidden->cardno,
&this->hidden->deviceno, SND_PCM_OPEN_CAPTURE);
}
}
else
{
/* Open requested audio device */
if (!this->hidden->iscapture)
{
status=snd_pcm_open(&this->hidden->audio_handle, this->hidden->cardno,
this->hidden->deviceno, SND_PCM_OPEN_PLAYBACK);
}
else
{
status=snd_pcm_open(&this->hidden->audio_handle, this->hidden->cardno,
this->hidden->deviceno, SND_PCM_OPEN_CAPTURE);
}
}
/* Check if requested device is opened */
if (status<0)
{
this->hidden->audio_handle=NULL;
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_open", status);
return 0;
}
if (!QSA_CheckBuggyCards(this, QSA_MMAP_WORKAROUND))
{
/* Disable QSA MMAP plugin for buggy audio drivers */
status=snd_pcm_plugin_set_disable(this->hidden->audio_handle, PLUGIN_DISABLE_MMAP);
if (status<0)
{
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_plugin_set_disable", status);
return 0;
}
}
/* Try for a closest match on audio format */
format = 0;
/* can't use format as SND_PCM_SFMT_U8 = 0 in qsa */
found = 0;
for (test_format = SDL_FirstAudioFormat(this->spec.format); !found;)
{
/* if match found set format to equivalent QSA format */
switch (test_format)
{
case AUDIO_U8:
{
format=SND_PCM_SFMT_U8;
found=1;
}
break;
case AUDIO_S8:
{
format=SND_PCM_SFMT_S8;
found=1;
}
break;
case AUDIO_S16LSB:
{
format=SND_PCM_SFMT_S16_LE;
found=1;
}
break;
case AUDIO_S16MSB:
{
format=SND_PCM_SFMT_S16_BE;
found=1;
}
break;
case AUDIO_U16LSB:
{
format=SND_PCM_SFMT_U16_LE;
found=1;
}
break;
case AUDIO_U16MSB:
{
format=SND_PCM_SFMT_U16_BE;
found=1;
}
break;
case AUDIO_S32LSB:
{
format=SND_PCM_SFMT_S32_LE;
found=1;
}
break;
case AUDIO_S32MSB:
{
format=SND_PCM_SFMT_S32_BE;
found=1;
}
break;
case AUDIO_F32LSB:
{
format=SND_PCM_SFMT_FLOAT_LE;
found=1;
}
break;
case AUDIO_F32MSB:
{
format=SND_PCM_SFMT_FLOAT_BE;
found=1;
}
break;
default:
{
break;
}
}
if (!found)
{
test_format = SDL_NextAudioFormat();
}
}
/* assumes test_format not 0 on success */
if (test_format==0)
{
QSA_CloseDevice(this);
SDL_SetError("QSA: Couldn't find any hardware audio formats");
return 0;
}
this->spec.format=test_format;
/* Set the audio format */
cparams.format.format=format;
/* Set mono/stereo/4ch/6ch/8ch audio */
cparams.format.voices=this->spec.channels;
/* Set rate */
cparams.format.rate=this->spec.freq;
/* Setup the transfer parameters according to cparams */
status=snd_pcm_plugin_params(this->hidden->audio_handle, &cparams);
if (status<0)
{
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_channel_params", status);
return 0;
}
/* Make sure channel is setup right one last time */
SDL_memset(&csetup, '\0', sizeof(csetup));
if (!this->hidden->iscapture)
{
csetup.channel=SND_PCM_CHANNEL_PLAYBACK;
}
else
{
csetup.channel=SND_PCM_CHANNEL_CAPTURE;
}
/* Setup an audio channel */
if (snd_pcm_plugin_setup(this->hidden->audio_handle, &csetup) < 0)
{
QSA_CloseDevice(this);
SDL_SetError("QSA: Unable to setup channel\n");
return 0;
}
/* Calculate the final parameters for this audio specification */
SDL_CalculateAudioSpec(&this->spec);
this->hidden->pcm_len = this->spec.size;
if (this->hidden->pcm_len==0)
{
this->hidden->pcm_len=csetup.buf.block.frag_size * this->spec.channels *
(snd_pcm_format_width(format) / 8);
}
/*
* Allocate memory to the audio buffer and initialize with silence
* (Note that buffer size must be a multiple of fragment size, so find
* closest multiple)
*/
this->hidden->pcm_buf=(Uint8*)SDL_AllocAudioMem(this->hidden->pcm_len);
if (this->hidden->pcm_buf==NULL)
{
QSA_CloseDevice(this);
SDL_OutOfMemory();
return 0;
}
SDL_memset(this->hidden->pcm_buf, this->spec.silence, this->hidden->pcm_len);
/* get the file descriptor */
if (!this->hidden->iscapture)
{
this->hidden->audio_fd=snd_pcm_file_descriptor(this->hidden->audio_handle,
SND_PCM_CHANNEL_PLAYBACK);
}
else
{
this->hidden->audio_fd=snd_pcm_file_descriptor(this->hidden->audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
if (this->hidden->audio_fd<0)
{
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_file_descriptor", status);
return 0;
}
/* Prepare an audio channel */
if (!this->hidden->iscapture)
{
/* Prepare audio playback */
status=snd_pcm_plugin_prepare(this->hidden->audio_handle, SND_PCM_CHANNEL_PLAYBACK);
}
else
{
/* Prepare audio capture */
status=snd_pcm_plugin_prepare(this->hidden->audio_handle, SND_PCM_CHANNEL_CAPTURE);
}
if (status<0)
{
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_plugin_prepare", status);
return 0;
}
/* We're really ready to rock and roll. :-) */
return 1;
}
int QSA_DetectDevices(int iscapture)
{
uint32_t it;
uint32_t cards;
uint32_t devices;
int32_t status;
/* Detect amount of available devices */
/* this value can be changed in the runtime */
cards=snd_cards();
/* If io-audio manager is not running we will get 0 as number */
/* of available audio devices */
if (cards==0)
{
/* We have no any available audio devices */
return 0;
}
/* Find requested devices by type */
if (!iscapture)
{
/* Playback devices enumeration requested */
for(it=0; it<cards; it++)
{
devices=0;
do {
status=snd_card_get_longname(it, qsa_playback_device[qsa_playback_devices].name, QSA_MAX_NAME_LENGTH);
if (status==EOK)
{ {
snd_pcm_t* handle; format = SND_PCM_SFMT_S8;
found = 1;
/* Add device number to device name */
sprintf(qsa_playback_device[qsa_playback_devices].name + SDL_strlen(qsa_playback_device[qsa_playback_devices].name), " d%d", devices);
/* Store associated card number id */
qsa_playback_device[qsa_playback_devices].cardno=it;
/* Check if this device id could play anything */
status=snd_pcm_open(&handle, it, devices, SND_PCM_OPEN_PLAYBACK);
if (status==EOK)
{
qsa_playback_device[qsa_playback_devices].deviceno=devices;
status=snd_pcm_close(handle);
if (status==EOK)
{
qsa_playback_devices++;
}
}
else
{
/* Check if we got end of devices list */
if (status==-ENOENT)
{
break;
}
}
} }
else break;
case AUDIO_S16LSB:
{ {
break; format = SND_PCM_SFMT_S16_LE;
found = 1;
} }
break;
/* Check if we reached maximum devices count */ case AUDIO_S16MSB:
if (qsa_playback_devices>=QSA_MAX_DEVICES)
{ {
break; format = SND_PCM_SFMT_S16_BE;
found = 1;
} }
devices++;
} while(1);
/* Check if we reached maximum devices count */
if (qsa_playback_devices>=QSA_MAX_DEVICES)
{
break; break;
} case AUDIO_U16LSB:
}
}
else
{
/* Capture devices enumeration requested */
for(it=0; it<cards; it++)
{
devices=0;
do {
status=snd_card_get_longname(it, qsa_capture_device[qsa_capture_devices].name, QSA_MAX_NAME_LENGTH);
if (status==EOK)
{ {
snd_pcm_t* handle; format = SND_PCM_SFMT_U16_LE;
found = 1;
/* Add device number to device name */
sprintf(qsa_capture_device[qsa_capture_devices].name + SDL_strlen(qsa_capture_device[qsa_capture_devices].name), " d%d", devices);
/* Store associated card number id */
qsa_capture_device[qsa_capture_devices].cardno=it;
/* Check if this device id could play anything */
status=snd_pcm_open(&handle, it, devices, SND_PCM_OPEN_CAPTURE);
if (status==EOK)
{
qsa_capture_device[qsa_capture_devices].deviceno=devices;
status=snd_pcm_close(handle);
if (status==EOK)
{
qsa_capture_devices++;
}
}
else
{
/* Check if we got end of devices list */
if (status==-ENOENT)
{
break;
}
}
/* Check if we reached maximum devices count */
if (qsa_capture_devices>=QSA_MAX_DEVICES)
{
break;
}
} }
else break;
case AUDIO_U16MSB:
{ {
break; format = SND_PCM_SFMT_U16_BE;
found = 1;
}
break;
case AUDIO_S32LSB:
{
format = SND_PCM_SFMT_S32_LE;
found = 1;
}
break;
case AUDIO_S32MSB:
{
format = SND_PCM_SFMT_S32_BE;
found = 1;
}
break;
case AUDIO_F32LSB:
{
format = SND_PCM_SFMT_FLOAT_LE;
found = 1;
} }
devices++;
} while(1);
/* Check if we reached maximum devices count */
if (qsa_capture_devices>=QSA_MAX_DEVICES)
{
break; break;
} case AUDIO_F32MSB:
} {
} format = SND_PCM_SFMT_FLOAT_BE;
found = 1;
/* Return amount of available playback or capture devices */ }
if (!iscapture) break;
{ default:
return qsa_playback_devices; {
} break;
else }
{ }
return qsa_capture_devices;
} if (!found) {
test_format = SDL_NextAudioFormat();
}
}
/* assumes test_format not 0 on success */
if (test_format == 0) {
QSA_CloseDevice(this);
SDL_SetError("QSA: Couldn't find any hardware audio formats");
return 0;
}
this->spec.format = test_format;
/* Set the audio format */
cparams.format.format = format;
/* Set mono/stereo/4ch/6ch/8ch audio */
cparams.format.voices = this->spec.channels;
/* Set rate */
cparams.format.rate = this->spec.freq;
/* Setup the transfer parameters according to cparams */
status = snd_pcm_plugin_params(this->hidden->audio_handle, &cparams);
if (status < 0) {
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_channel_params", status);
return 0;
}
/* Make sure channel is setup right one last time */
SDL_memset(&csetup, '\0', sizeof(csetup));
if (!this->hidden->iscapture) {
csetup.channel = SND_PCM_CHANNEL_PLAYBACK;
} else {
csetup.channel = SND_PCM_CHANNEL_CAPTURE;
}
/* Setup an audio channel */
if (snd_pcm_plugin_setup(this->hidden->audio_handle, &csetup) < 0) {
QSA_CloseDevice(this);
SDL_SetError("QSA: Unable to setup channel\n");
return 0;
}
/* Calculate the final parameters for this audio specification */
SDL_CalculateAudioSpec(&this->spec);
this->hidden->pcm_len = this->spec.size;
if (this->hidden->pcm_len == 0) {
this->hidden->pcm_len =
csetup.buf.block.frag_size * this->spec.channels *
(snd_pcm_format_width(format) / 8);
}
/*
* Allocate memory to the audio buffer and initialize with silence
* (Note that buffer size must be a multiple of fragment size, so find
* closest multiple)
*/
this->hidden->pcm_buf =
(Uint8 *) SDL_AllocAudioMem(this->hidden->pcm_len);
if (this->hidden->pcm_buf == NULL) {
QSA_CloseDevice(this);
SDL_OutOfMemory();
return 0;
}
SDL_memset(this->hidden->pcm_buf, this->spec.silence,
this->hidden->pcm_len);
/* get the file descriptor */
if (!this->hidden->iscapture) {
this->hidden->audio_fd =
snd_pcm_file_descriptor(this->hidden->audio_handle,
SND_PCM_CHANNEL_PLAYBACK);
} else {
this->hidden->audio_fd =
snd_pcm_file_descriptor(this->hidden->audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
if (this->hidden->audio_fd < 0) {
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_file_descriptor", status);
return 0;
}
/* Prepare an audio channel */
if (!this->hidden->iscapture) {
/* Prepare audio playback */
status =
snd_pcm_plugin_prepare(this->hidden->audio_handle,
SND_PCM_CHANNEL_PLAYBACK);
} else {
/* Prepare audio capture */
status =
snd_pcm_plugin_prepare(this->hidden->audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
if (status < 0) {
QSA_CloseDevice(this);
QSA_SetError("snd_pcm_plugin_prepare", status);
return 0;
}
/* We're really ready to rock and roll. :-) */
return 1;
} }
const char* QSA_GetDeviceName(int index, int iscapture) int
QSA_DetectDevices(int iscapture)
{ {
if (!iscapture) uint32_t it;
{ uint32_t cards;
if (index>=qsa_playback_devices) uint32_t devices;
{ int32_t status;
return "No such playback device";
} /* Detect amount of available devices */
/* this value can be changed in the runtime */
return qsa_playback_device[index].name; cards = snd_cards();
}
else /* If io-audio manager is not running we will get 0 as number */
{ /* of available audio devices */
if (index>=qsa_capture_devices) if (cards == 0) {
{ /* We have no any available audio devices */
return "No such capture device"; return 0;
} }
return qsa_capture_device[index].name; /* Find requested devices by type */
} if (!iscapture) {
/* Playback devices enumeration requested */
for (it = 0; it < cards; it++) {
devices = 0;
do {
status =
snd_card_get_longname(it,
qsa_playback_device
[qsa_playback_devices].name,
QSA_MAX_NAME_LENGTH);
if (status == EOK) {
snd_pcm_t *handle;
/* Add device number to device name */
sprintf(qsa_playback_device[qsa_playback_devices].name +
SDL_strlen(qsa_playback_device
[qsa_playback_devices].name), " d%d",
devices);
/* Store associated card number id */
qsa_playback_device[qsa_playback_devices].cardno = it;
/* Check if this device id could play anything */
status =
snd_pcm_open(&handle, it, devices,
SND_PCM_OPEN_PLAYBACK);
if (status == EOK) {
qsa_playback_device[qsa_playback_devices].deviceno =
devices;
status = snd_pcm_close(handle);
if (status == EOK) {
qsa_playback_devices++;
}
} else {
/* Check if we got end of devices list */
if (status == -ENOENT) {
break;
}
}
} else {
break;
}
/* Check if we reached maximum devices count */
if (qsa_playback_devices >= QSA_MAX_DEVICES) {
break;
}
devices++;
} while (1);
/* Check if we reached maximum devices count */
if (qsa_playback_devices >= QSA_MAX_DEVICES) {
break;
}
}
} else {
/* Capture devices enumeration requested */
for (it = 0; it < cards; it++) {
devices = 0;
do {
status =
snd_card_get_longname(it,
qsa_capture_device
[qsa_capture_devices].name,
QSA_MAX_NAME_LENGTH);
if (status == EOK) {
snd_pcm_t *handle;
/* Add device number to device name */
sprintf(qsa_capture_device[qsa_capture_devices].name +
SDL_strlen(qsa_capture_device
[qsa_capture_devices].name), " d%d",
devices);
/* Store associated card number id */
qsa_capture_device[qsa_capture_devices].cardno = it;
/* Check if this device id could play anything */
status =
snd_pcm_open(&handle, it, devices,
SND_PCM_OPEN_CAPTURE);
if (status == EOK) {
qsa_capture_device[qsa_capture_devices].deviceno =
devices;
status = snd_pcm_close(handle);
if (status == EOK) {
qsa_capture_devices++;
}
} else {
/* Check if we got end of devices list */
if (status == -ENOENT) {
break;
}
}
/* Check if we reached maximum devices count */
if (qsa_capture_devices >= QSA_MAX_DEVICES) {
break;
}
} else {
break;
}
devices++;
} while (1);
/* Check if we reached maximum devices count */
if (qsa_capture_devices >= QSA_MAX_DEVICES) {
break;
}
}
}
/* Return amount of available playback or capture devices */
if (!iscapture) {
return qsa_playback_devices;
} else {
return qsa_capture_devices;
}
} }
void QSA_WaitDone(_THIS) const char *
QSA_GetDeviceName(int index, int iscapture)
{ {
if (!this->hidden->iscapture) if (!iscapture) {
{ if (index >= qsa_playback_devices) {
if (this->hidden->audio_handle!=NULL) return "No such playback device";
{ }
/* Wait till last fragment is played and stop channel */
snd_pcm_plugin_flush(this->hidden->audio_handle, SND_PCM_CHANNEL_PLAYBACK); return qsa_playback_device[index].name;
} } else {
} if (index >= qsa_capture_devices) {
else return "No such capture device";
{ }
if (this->hidden->audio_handle!=NULL)
{ return qsa_capture_device[index].name;
/* Discard all unread data and stop channel */ }
snd_pcm_plugin_flush(this->hidden->audio_handle, SND_PCM_CHANNEL_CAPTURE);
}
}
} }
void QSA_Deinitialize(void) void
QSA_WaitDone(_THIS)
{ {
/* Clear devices array on shutdown */ if (!this->hidden->iscapture) {
SDL_memset(qsa_playback_device, 0x00, sizeof(QSA_Device)*QSA_MAX_DEVICES); if (this->hidden->audio_handle != NULL) {
SDL_memset(qsa_capture_device, 0x00, sizeof(QSA_Device)*QSA_MAX_DEVICES); /* Wait till last fragment is played and stop channel */
qsa_playback_devices=0; snd_pcm_plugin_flush(this->hidden->audio_handle,
qsa_capture_devices=0; SND_PCM_CHANNEL_PLAYBACK);
}
} else {
if (this->hidden->audio_handle != NULL) {
/* Discard all unread data and stop channel */
snd_pcm_plugin_flush(this->hidden->audio_handle,
SND_PCM_CHANNEL_CAPTURE);
}
}
} }
static int QSA_Init(SDL_AudioDriverImpl* impl) void
QSA_Deinitialize(void)
{ {
snd_pcm_t* handle=NULL; /* Clear devices array on shutdown */
int32_t status=0; SDL_memset(qsa_playback_device, 0x00,
sizeof(QSA_Device) * QSA_MAX_DEVICES);
/* Clear devices array */ SDL_memset(qsa_capture_device, 0x00,
SDL_memset(qsa_playback_device, 0x00, sizeof(QSA_Device)*QSA_MAX_DEVICES); sizeof(QSA_Device) * QSA_MAX_DEVICES);
SDL_memset(qsa_capture_device, 0x00, sizeof(QSA_Device)*QSA_MAX_DEVICES); qsa_playback_devices = 0;
qsa_playback_devices=0; qsa_capture_devices = 0;
qsa_capture_devices=0;
/* Set function pointers */
/* DeviceLock and DeviceUnlock functions are used default, */
/* provided by SDL, which uses pthread_mutex for lock/unlock */
impl->DetectDevices=QSA_DetectDevices;
impl->GetDeviceName=QSA_GetDeviceName;
impl->OpenDevice=QSA_OpenDevice;
impl->ThreadInit=QSA_ThreadInit;
impl->WaitDevice=QSA_WaitDevice;
impl->PlayDevice=QSA_PlayDevice;
impl->GetDeviceBuf=QSA_GetDeviceBuf;
impl->CloseDevice=QSA_CloseDevice;
impl->WaitDone=QSA_WaitDone;
impl->Deinitialize=QSA_Deinitialize;
impl->LockDevice=NULL;
impl->UnlockDevice=NULL;
impl->OnlyHasDefaultOutputDevice=0;
impl->ProvidesOwnCallbackThread=0;
impl->SkipMixerLock=0;
impl->HasCaptureSupport=1;
impl->OnlyHasDefaultOutputDevice=0;
impl->OnlyHasDefaultInputDevice=0;
/* Check if io-audio manager is running or not */
status=snd_cards();
if (status==0)
{
/* if no, return immediately */
return 1;
}
/* At this point we are definitely has an audio device */
return 2;
} }
AudioBootStrap QSAAUDIO_bootstrap= static int
QSA_Init(SDL_AudioDriverImpl * impl)
{ {
DRIVER_NAME, "QNX QSA Audio", QSA_Init, 0 snd_pcm_t *handle = NULL;
int32_t status = 0;
/* Clear devices array */
SDL_memset(qsa_playback_device, 0x00,
sizeof(QSA_Device) * QSA_MAX_DEVICES);
SDL_memset(qsa_capture_device, 0x00,
sizeof(QSA_Device) * QSA_MAX_DEVICES);
qsa_playback_devices = 0;
qsa_capture_devices = 0;
/* Set function pointers */
/* DeviceLock and DeviceUnlock functions are used default, */
/* provided by SDL, which uses pthread_mutex for lock/unlock */
impl->DetectDevices = QSA_DetectDevices;
impl->GetDeviceName = QSA_GetDeviceName;
impl->OpenDevice = QSA_OpenDevice;
impl->ThreadInit = QSA_ThreadInit;
impl->WaitDevice = QSA_WaitDevice;
impl->PlayDevice = QSA_PlayDevice;
impl->GetDeviceBuf = QSA_GetDeviceBuf;
impl->CloseDevice = QSA_CloseDevice;
impl->WaitDone = QSA_WaitDone;
impl->Deinitialize = QSA_Deinitialize;
impl->LockDevice = NULL;
impl->UnlockDevice = NULL;
impl->OnlyHasDefaultOutputDevice = 0;
impl->ProvidesOwnCallbackThread = 0;
impl->SkipMixerLock = 0;
impl->HasCaptureSupport = 1;
impl->OnlyHasDefaultOutputDevice = 0;
impl->OnlyHasDefaultInputDevice = 0;
/* Check if io-audio manager is running or not */
status = snd_cards();
if (status == 0) {
/* if no, return immediately */
return 1;
}
/* At this point we are definitely has an audio device */
return 2;
}
AudioBootStrap QSAAUDIO_bootstrap = {
DRIVER_NAME, "QNX QSA Audio", QSA_Init, 0
}; };
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/audio/qsa/SDL_qsa_audio.h
View file @ 483f2ba3
...@@ -44,7 +44,7 @@ struct SDL_PrivateAudioData ...@@ -44,7 +44,7 @@ struct SDL_PrivateAudioData
/* The audio device handle */ /* The audio device handle */
int cardno; int cardno;
int deviceno; int deviceno;
snd_pcm_t* audio_handle; snd_pcm_t *audio_handle;
/* The audio file descriptor */ /* The audio file descriptor */
int audio_fd; int audio_fd;
...@@ -53,7 +53,7 @@ struct SDL_PrivateAudioData ...@@ -53,7 +53,7 @@ struct SDL_PrivateAudioData
uint32_t timeout_on_wait; uint32_t timeout_on_wait;
/* Raw mixing buffer */ /* Raw mixing buffer */
Uint8* pcm_buf; Uint8 *pcm_buf;
Uint32 pcm_len; Uint32 pcm_len;
}; };
......
src/video/SDL_renderer_gles.c
View file @ 483f2ba3
...@@ -34,9 +34,10 @@ ...@@ -34,9 +34,10 @@
/* Empty function stub to get OpenGL ES 1.0 support without */ /* Empty function stub to get OpenGL ES 1.0 support without */
/* OpenGL ES extension GL_OES_draw_texture_supported */ /* OpenGL ES extension GL_OES_draw_texture_supported */
GL_API void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height) GL_API void GL_APIENTRY
glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
{ {
return; return;
} }
#endif /* __QNXNTO__ */ #endif /* __QNXNTO__ */
...@@ -105,8 +106,7 @@ SDL_RenderDriver GL_ES_RenderDriver = { ...@@ -105,8 +106,7 @@ SDL_RenderDriver GL_ES_RenderDriver = {
{ {
/* OpenGL ES 1.x supported formats list */ /* OpenGL ES 1.x supported formats list */
SDL_PIXELFORMAT_BGR24, SDL_PIXELFORMAT_BGR24,
SDL_PIXELFORMAT_ABGR8888 SDL_PIXELFORMAT_ABGR8888},
},
0, 0,
0} 0}
}; };
...@@ -351,7 +351,7 @@ power_of_2(int input) ...@@ -351,7 +351,7 @@ power_of_2(int input)
} }
static int static int
GLES_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture) GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata; GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
SDL_Window *window = SDL_GetWindowFromID(renderer->window); SDL_Window *window = SDL_GetWindowFromID(renderer->window);
...@@ -363,15 +363,15 @@ GLES_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture) ...@@ -363,15 +363,15 @@ GLES_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
switch (texture->format) { switch (texture->format) {
case SDL_PIXELFORMAT_BGR24: case SDL_PIXELFORMAT_BGR24:
internalFormat = GL_RGB; internalFormat = GL_RGB;
format = GL_RGB; format = GL_RGB;
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
case SDL_PIXELFORMAT_ABGR8888: case SDL_PIXELFORMAT_ABGR8888:
internalFormat = GL_RGBA; internalFormat = GL_RGBA;
format = GL_RGBA; format = GL_RGBA;
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
/* /*
These formats would be supported if SDL had the necessary pixel formats These formats would be supported if SDL had the necessary pixel formats
case SDL_PIXELFORMAT_BGR565: case SDL_PIXELFORMAT_BGR565:
...@@ -389,7 +389,7 @@ GLES_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture) ...@@ -389,7 +389,7 @@ GLES_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
format = GL_RGBA; format = GL_RGBA;
type = GL_UNSIGNED_SHORT_4_4_4_4; type = GL_UNSIGNED_SHORT_4_4_4_4;
break; break;
*/ */
default: default:
SDL_SetError("Unsupported texture format"); SDL_SetError("Unsupported texture format");
return -1; return -1;
...@@ -533,8 +533,8 @@ GLES_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -533,8 +533,8 @@ GLES_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture)
} }
static int static int
GLES_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect *rect, const void *pixels, int pitch) const SDL_Rect * rect, const void *pixels, int pitch)
{ {
GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata; GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata; GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
...@@ -858,7 +858,7 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -858,7 +858,7 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
} }
static void static void
GLES_RenderPresent(SDL_Renderer *renderer) GLES_RenderPresent(SDL_Renderer * renderer)
{ {
SDL_GL_SwapWindow(renderer->window); SDL_GL_SwapWindow(renderer->window);
} }
......
src/video/SDL_video.c
View file @ 483f2ba3
...@@ -1496,10 +1496,9 @@ SDL_CreateRenderer(SDL_WindowID windowID, int index, Uint32 flags) ...@@ -1496,10 +1496,9 @@ SDL_CreateRenderer(SDL_WindowID windowID, int index, Uint32 flags)
window->renderer = SDL_CurrentDisplay.render_drivers[index] window->renderer = SDL_CurrentDisplay.render_drivers[index]
.CreateRenderer(window, flags); .CreateRenderer(window, flags);
if (window->renderer==NULL) if (window->renderer == NULL) {
{ /* Assuming renderer set its error */
/* Assuming renderer set its error */ return -1;
return -1;
} }
SDL_SelectRenderer(window->id); SDL_SelectRenderer(window->id);
...@@ -2719,7 +2718,7 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) ...@@ -2719,7 +2718,7 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
{ {
#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES
void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params); void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params);
GLenum (APIENTRY * glGetErrorFunc) (void); GLenum(APIENTRY * glGetErrorFunc) (void);
GLenum attrib = 0; GLenum attrib = 0;
GLenum error = 0; GLenum error = 0;
...@@ -2734,7 +2733,7 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) ...@@ -2734,7 +2733,7 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
} }
/* Clear value in any case */ /* Clear value in any case */
*value=0; *value = 0;
switch (attr) { switch (attr) {
case SDL_GL_RETAINED_BACKING: case SDL_GL_RETAINED_BACKING:
...@@ -2842,28 +2841,26 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) ...@@ -2842,28 +2841,26 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
} }
glGetIntegervFunc(attrib, (GLint *) value); glGetIntegervFunc(attrib, (GLint *) value);
error=glGetErrorFunc(); error = glGetErrorFunc();
if (error!=GL_NO_ERROR) if (error != GL_NO_ERROR) {
{ switch (error) {
switch (error) case GL_INVALID_ENUM:
{ {
case GL_INVALID_ENUM: SDL_SetError("OpenGL error: GL_INVALID_ENUM");
{ }
SDL_SetError("OpenGL error: GL_INVALID_ENUM"); break;
} case GL_INVALID_VALUE:
break; {
case GL_INVALID_VALUE: SDL_SetError("OpenGL error: GL_INVALID_VALUE");
{ }
SDL_SetError("OpenGL error: GL_INVALID_VALUE"); break;
} default:
break; {
default: SDL_SetError("OpenGL error: %08X", error);
{ }
SDL_SetError("OpenGL error: %08X", error); break;
} }
break; return -1;
}
return -1;
} }
return 0; return 0;
#else #else
......
src/video/nds/SDL_ndsrender.c
View file @ 483f2ba3
...@@ -88,7 +88,7 @@ SDL_RenderDriver NDS_RenderDriver = { ...@@ -88,7 +88,7 @@ SDL_RenderDriver NDS_RenderDriver = {
SDL_PIXELFORMAT_INDEX8, SDL_PIXELFORMAT_INDEX8,
SDL_PIXELFORMAT_ABGR1555, SDL_PIXELFORMAT_ABGR1555,
SDL_PIXELFORMAT_BGR555, SDL_PIXELFORMAT_BGR555,
}, /* u32 texture_formats[20] */ }, /* u32 texture_formats[20] */
(256), /* int max_texture_width */ (256), /* int max_texture_width */
(256), /* int max_texture_height */ (256), /* int max_texture_height */
} }
...@@ -107,8 +107,14 @@ typedef struct ...@@ -107,8 +107,14 @@ typedef struct
{ NDSTX_BG, NDSTX_SPR } type; /* represented in a bg or sprite. */ { NDSTX_BG, NDSTX_SPR } type; /* represented in a bg or sprite. */
int hw_index; /* index of sprite in OAM or bg from libnds */ int hw_index; /* index of sprite in OAM or bg from libnds */
int pitch, bpp; /* useful information about the texture */ int pitch, bpp; /* useful information about the texture */
struct { int x,y; } scale; /* x/y stretch (24.8 fixed point) */ struct
struct { int x,y; } scroll; /* x/y offset */ {
int x, y;
} scale; /* x/y stretch (24.8 fixed point) */
struct
{
int x, y;
} scroll; /* x/y offset */
int rotate; /* -32768 to 32767, texture rotation */ int rotate; /* -32768 to 32767, texture rotation */
u16 *vram_pixels; /* where the pixel data is stored (a pointer into VRAM) */ u16 *vram_pixels; /* where the pixel data is stored (a pointer into VRAM) */
u16 *vram_palette; /* where the palette data is stored if it's indexed. */ u16 *vram_palette; /* where the palette data is stored if it's indexed. */
...@@ -197,9 +203,9 @@ NDS_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -197,9 +203,9 @@ NDS_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->info.max_texture_height = renderer->info.max_texture_height =
NDS_RenderDriver.info.max_texture_height; NDS_RenderDriver.info.max_texture_height;
data->sub = 0; /* TODO: this is hard-coded to the "main" screen. data->sub = 0; /* TODO: this is hard-coded to the "main" screen.
figure out how to detect whether to set it to figure out how to detect whether to set it to
"sub" screen. window->id, perhaps? */ "sub" screen. window->id, perhaps? */
data->bg_taken[2] = data->bg_taken[3] = 0; data->bg_taken[2] = data->bg_taken[3] = 0;
return renderer; return renderer;
...@@ -310,9 +316,10 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -310,9 +316,10 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
txdat->dim.vdy = 0x100; txdat->dim.vdy = 0x100;
txdat->dim.pitch = pitch; txdat->dim.pitch = pitch;
txdat->dim.bpp = bpp; txdat->dim.bpp = bpp;
txdat->vram_pixels = (u16 *) (data->sub ? SPRITE_GFX_SUB : SPRITE_GFX); txdat->vram_pixels =
(u16 *) (data->sub ? SPRITE_GFX_SUB : SPRITE_GFX);
/* FIXME: use tileIdx*boundary /* FIXME: use tileIdx*boundary
to point to proper location */ to point to proper location */
} else { } else {
SDL_SetError("Out of NDS sprites."); SDL_SetError("Out of NDS sprites.");
} }
...@@ -332,20 +339,26 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -332,20 +339,26 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
SDL_OutOfMemory(); SDL_OutOfMemory();
return -1; return -1;
} }
// hard-coded for 256x256 for now... // hard-coded for 256x256 for now...
// TODO: a series of if-elseif-else's to find the closest but larger size. // TODO: a series of if-elseif-else's to find the closest but larger size.
if(!data->sub) { if (!data->sub) {
if(bpp==8) { if (bpp == 8) {
txdat->hw_index = bgInit(whichbg, BgType_Bmp8, BgSize_B8_256x256, 0, 0); txdat->hw_index =
bgInit(whichbg, BgType_Bmp8, BgSize_B8_256x256, 0, 0);
} else { } else {
txdat->hw_index = bgInit(whichbg, BgType_Bmp16, BgSize_B16_256x256, 0, 0); txdat->hw_index =
bgInit(whichbg, BgType_Bmp16, BgSize_B16_256x256, 0,
0);
} }
} else { } else {
if(bpp==8) { if (bpp == 8) {
txdat->hw_index = bgInitSub(whichbg, BgType_Bmp8, BgSize_B8_256x256, 0, 0); txdat->hw_index =
bgInitSub(whichbg, BgType_Bmp8, BgSize_B8_256x256, 0,
0);
} else { } else {
txdat->hw_index = bgInitSub(whichbg, BgType_Bmp16, BgSize_B16_256x256, 0, 0); txdat->hw_index =
bgInitSub(whichbg, BgType_Bmp16, BgSize_B16_256x256,
0, 0);
} }
} }
...@@ -357,14 +370,14 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -357,14 +370,14 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
bgUpdate(bg3); bgUpdate(bg3);
*/ */
txdat->type = NDSTX_BG; txdat->type = NDSTX_BG;
txdat->pitch = (texture->w)*(bpp/8); txdat->pitch = (texture->w) * (bpp / 8);
txdat->bpp = bpp; txdat->bpp = bpp;
txdat->rotate = 0; txdat->rotate = 0;
txdat->scale.x = 0x100; txdat->scale.x = 0x100;
txdat->scale.y = 0x100; txdat->scale.y = 0x100;
txdat->scroll.x = 0; txdat->scroll.x = 0;
txdat->scroll.y = 0; txdat->scroll.y = 0;
txdat->vram_pixels = (u16*)bgGetGfxPtr(txdat->hw_index); txdat->vram_pixels = (u16 *) bgGetGfxPtr(txdat->hw_index);
bgSetCenter(txdat->hw_index, 0, 0); bgSetCenter(txdat->hw_index, 0, 0);
bgSetRotateScale(txdat->hw_index, txdat->rotate, txdat->scale.x, bgSetRotateScale(txdat->hw_index, txdat->rotate, txdat->scale.x,
...@@ -458,7 +471,7 @@ NDS_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, ...@@ -458,7 +471,7 @@ NDS_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b,
int i, j; int i, j;
printf("NDS_RenderFill: stub\n"); printf("NDS_RenderFill: stub\n");
color = RGB8(r, g, b); /* macro in libnds that makes an ARGB1555 pixel */ color = RGB8(r, g, b); /* macro in libnds that makes an ARGB1555 pixel */
/* TODO: make a single-color sprite and stretch it. /* TODO: make a single-color sprite and stretch it.
calculate the "HDX" width modifier of the sprite by: calculate the "HDX" width modifier of the sprite by:
let S be the actual sprite's width (like, 32 pixels for example) let S be the actual sprite's width (like, 32 pixels for example)
......
src/video/photon/SDL_photon.c
View file @ 483f2ba3
This source diff could not be displayed because it is too large. You can view the blob instead.
src/video/photon/SDL_photon.h
View file @ 483f2ba3
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
/* GF headers must be included first for the Photon GF functions */ /* GF headers must be included first for the Photon GF functions */
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
#include <gf/gf.h> #include <gf/gf.h>
#include <GLES/egl.h> #include <GLES/egl.h>
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
#include "SDL_config.h" #include "SDL_config.h"
...@@ -45,17 +45,17 @@ ...@@ -45,17 +45,17 @@
typedef struct SDL_VideoData typedef struct SDL_VideoData
{ {
PhRid_t rid[SDL_VIDEO_PHOTON_MAX_RIDS]; PhRid_t rid[SDL_VIDEO_PHOTON_MAX_RIDS];
uint32_t avail_rids; uint32_t avail_rids;
uint32_t current_device_id; uint32_t current_device_id;
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
gf_dev_t gfdev; /* GF device handle */ gf_dev_t gfdev; /* GF device handle */
gf_dev_info_t gfdev_info; /* GF device information */ gf_dev_info_t gfdev_info; /* GF device information */
SDL_bool gfinitialized; /* GF device initialization status */ SDL_bool gfinitialized; /* GF device initialization status */
EGLDisplay egldisplay; /* OpenGL ES display connection */ EGLDisplay egldisplay; /* OpenGL ES display connection */
uint32_t egl_refcount; /* OpenGL ES reference count */ uint32_t egl_refcount; /* OpenGL ES reference count */
uint32_t swapinterval; /* OpenGL ES default swap interval */ uint32_t swapinterval; /* OpenGL ES default swap interval */
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_VideoData; } SDL_VideoData;
/* This is hardcoded value in photon/Pg.h */ /* This is hardcoded value in photon/Pg.h */
...@@ -67,19 +67,19 @@ typedef struct SDL_VideoData ...@@ -67,19 +67,19 @@ typedef struct SDL_VideoData
typedef struct SDL_DisplayData typedef struct SDL_DisplayData
{ {
uint32_t device_id; uint32_t device_id;
uint32_t custom_refresh; /* Custom refresh rate for all modes */ uint32_t custom_refresh; /* Custom refresh rate for all modes */
SDL_DisplayMode current_mode; /* Current video mode */ SDL_DisplayMode current_mode; /* Current video mode */
uint8_t description[SDL_VIDEO_PHOTON_DEVICENAME_MAX]; uint8_t description[SDL_VIDEO_PHOTON_DEVICENAME_MAX];
/* Device description */ /* Device description */
uint32_t caps; /* Device capabilities */ uint32_t caps; /* Device capabilities */
PhCursorDef_t* cursor; /* Global cursor settings */ PhCursorDef_t *cursor; /* Global cursor settings */
SDL_bool cursor_visible; /* SDL_TRUE if cursor visible */ SDL_bool cursor_visible; /* SDL_TRUE if cursor visible */
uint32_t cursor_size; /* Cursor size in memory w/ structure */ uint32_t cursor_size; /* Cursor size in memory w/ structure */
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
gf_display_t display; /* GF display handle */ gf_display_t display; /* GF display handle */
gf_display_info_t display_info; /* GF display information */ gf_display_info_t display_info; /* GF display information */
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_DisplayData; } SDL_DisplayData;
/* Maximum amount of OpenGL ES framebuffer configurations */ /* Maximum amount of OpenGL ES framebuffer configurations */
...@@ -87,18 +87,18 @@ typedef struct SDL_DisplayData ...@@ -87,18 +87,18 @@ typedef struct SDL_DisplayData
typedef struct SDL_WindowData typedef struct SDL_WindowData
{ {
SDL_bool uses_gles; /* if true window must support OpenGL ES*/ SDL_bool uses_gles; /* if true window must support OpenGL ES */
PtWidget_t* window; /* window handle */ PtWidget_t *window; /* window handle */
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
EGLConfig gles_configs[SDL_VIDEO_GF_OPENGLES_CONFS]; EGLConfig gles_configs[SDL_VIDEO_GF_OPENGLES_CONFS];
/* OpenGL ES framebuffer confs */ /* OpenGL ES framebuffer confs */
EGLint gles_config; /* OpenGL ES configuration index */ EGLint gles_config; /* OpenGL ES configuration index */
EGLContext gles_context; /* OpenGL ES context */ EGLContext gles_context; /* OpenGL ES context */
EGLint gles_attributes[256]; /* OpenGL ES attributes for context */ EGLint gles_attributes[256]; /* OpenGL ES attributes for context */
EGLSurface gles_surface; /* OpenGL ES target rendering surface */ EGLSurface gles_surface; /* OpenGL ES target rendering surface */
gf_surface_t gfsurface; /* OpenGL ES GF's surface */ gf_surface_t gfsurface; /* OpenGL ES GF's surface */
PdOffscreenContext_t* phsurface; /* OpenGL ES Photon's surface */ PdOffscreenContext_t *phsurface; /* OpenGL ES Photon's surface */
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_WindowData; } SDL_WindowData;
/****************************************************************************/ /****************************************************************************/
...@@ -106,8 +106,8 @@ typedef struct SDL_WindowData ...@@ -106,8 +106,8 @@ typedef struct SDL_WindowData
/****************************************************************************/ /****************************************************************************/
typedef struct Photon_DeviceCaps typedef struct Photon_DeviceCaps
{ {
uint8_t* name; uint8_t *name;
uint32_t caps; uint32_t caps;
} Photon_DeviceCaps; } Photon_DeviceCaps;
#define SDL_PHOTON_UNACCELERATED 0x00000000 #define SDL_PHOTON_UNACCELERATED 0x00000000
...@@ -120,41 +120,42 @@ typedef struct Photon_DeviceCaps ...@@ -120,41 +120,42 @@ typedef struct Photon_DeviceCaps
/****************************************************************************/ /****************************************************************************/
/* Display and window functions */ /* Display and window functions */
int photon_videoinit(_THIS); int photon_videoinit(_THIS);
void photon_videoquit(_THIS); void photon_videoquit(_THIS);
void photon_getdisplaymodes(_THIS); void photon_getdisplaymodes(_THIS);
int photon_setdisplaymode(_THIS, SDL_DisplayMode* mode); int photon_setdisplaymode(_THIS, SDL_DisplayMode * mode);
int photon_setdisplaypalette(_THIS, SDL_Palette* palette); int photon_setdisplaypalette(_THIS, SDL_Palette * palette);
int photon_getdisplaypalette(_THIS, SDL_Palette* palette); int photon_getdisplaypalette(_THIS, SDL_Palette * palette);
int photon_setdisplaygammaramp(_THIS, Uint16* ramp); int photon_setdisplaygammaramp(_THIS, Uint16 * ramp);
int photon_getdisplaygammaramp(_THIS, Uint16* ramp); int photon_getdisplaygammaramp(_THIS, Uint16 * ramp);
int photon_createwindow(_THIS, SDL_Window* window); int photon_createwindow(_THIS, SDL_Window * window);
int photon_createwindowfrom(_THIS, SDL_Window* window, const void* data); int photon_createwindowfrom(_THIS, SDL_Window * window, const void *data);
void photon_setwindowtitle(_THIS, SDL_Window* window); void photon_setwindowtitle(_THIS, SDL_Window * window);
void photon_setwindowicon(_THIS, SDL_Window* window, SDL_Surface* icon); void photon_setwindowicon(_THIS, SDL_Window * window, SDL_Surface * icon);
void photon_setwindowposition(_THIS, SDL_Window* window); void photon_setwindowposition(_THIS, SDL_Window * window);
void photon_setwindowsize(_THIS, SDL_Window* window); void photon_setwindowsize(_THIS, SDL_Window * window);
void photon_showwindow(_THIS, SDL_Window* window); void photon_showwindow(_THIS, SDL_Window * window);
void photon_hidewindow(_THIS, SDL_Window* window); void photon_hidewindow(_THIS, SDL_Window * window);
void photon_raisewindow(_THIS, SDL_Window* window); void photon_raisewindow(_THIS, SDL_Window * window);
void photon_maximizewindow(_THIS, SDL_Window* window); void photon_maximizewindow(_THIS, SDL_Window * window);
void photon_minimizewindow(_THIS, SDL_Window* window); void photon_minimizewindow(_THIS, SDL_Window * window);
void photon_restorewindow(_THIS, SDL_Window* window); void photon_restorewindow(_THIS, SDL_Window * window);
void photon_setwindowgrab(_THIS, SDL_Window* window); void photon_setwindowgrab(_THIS, SDL_Window * window);
void photon_destroywindow(_THIS, SDL_Window* window); void photon_destroywindow(_THIS, SDL_Window * window);
/* Window manager function */ /* Window manager function */
SDL_bool photon_getwindowwminfo(_THIS, SDL_Window* window, struct SDL_SysWMinfo* info); SDL_bool photon_getwindowwminfo(_THIS, SDL_Window * window,
struct SDL_SysWMinfo *info);
/* OpenGL/OpenGL ES functions */ /* OpenGL/OpenGL ES functions */
int photon_gl_loadlibrary(_THIS, const char* path); int photon_gl_loadlibrary(_THIS, const char *path);
void* photon_gl_getprocaddres(_THIS, const char* proc); void *photon_gl_getprocaddres(_THIS, const char *proc);
void photon_gl_unloadlibrary(_THIS); void photon_gl_unloadlibrary(_THIS);
SDL_GLContext photon_gl_createcontext(_THIS, SDL_Window* window); SDL_GLContext photon_gl_createcontext(_THIS, SDL_Window * window);
int photon_gl_makecurrent(_THIS, SDL_Window* window, SDL_GLContext context); int photon_gl_makecurrent(_THIS, SDL_Window * window, SDL_GLContext context);
int photon_gl_setswapinterval(_THIS, int interval); int photon_gl_setswapinterval(_THIS, int interval);
int photon_gl_getswapinterval(_THIS); int photon_gl_getswapinterval(_THIS);
void photon_gl_swapwindow(_THIS, SDL_Window* window); void photon_gl_swapwindow(_THIS, SDL_Window * window);
void photon_gl_deletecontext(_THIS, SDL_GLContext context); void photon_gl_deletecontext(_THIS, SDL_GLContext context);
/* Event handling function */ /* Event handling function */
......
src/video/photon/SDL_photon_input.c
View file @ 483f2ba3
...@@ -34,727 +34,699 @@ ...@@ -34,727 +34,699 @@
#include "SDL_photon_keycodes.h" #include "SDL_photon_keycodes.h"
/* Mouse related functions */ /* Mouse related functions */
SDL_Cursor* photon_createcursor(SDL_Surface* surface, int hot_x, int hot_y); SDL_Cursor *photon_createcursor(SDL_Surface * surface, int hot_x, int hot_y);
int photon_showcursor(SDL_Cursor* cursor); int photon_showcursor(SDL_Cursor * cursor);
void photon_movecursor(SDL_Cursor* cursor); void photon_movecursor(SDL_Cursor * cursor);
void photon_freecursor(SDL_Cursor* cursor); void photon_freecursor(SDL_Cursor * cursor);
void photon_warpmouse(SDL_Mouse* mouse, SDL_WindowID windowID, int x, int y); void photon_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y);
void photon_freemouse(SDL_Mouse* mouse); void photon_freemouse(SDL_Mouse * mouse);
int32_t photon_addinputdevices(_THIS) int32_t
photon_addinputdevices(_THIS)
{ {
SDL_VideoData* phdata=(SDL_VideoData*)_this->driverdata; SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
SDL_DisplayData* didata=NULL; SDL_DisplayData *didata = NULL;
struct SDL_Mouse photon_mouse; struct SDL_Mouse photon_mouse;
SDL_MouseData* mdata=NULL; SDL_MouseData *mdata = NULL;
SDL_Keyboard photon_keyboard; SDL_Keyboard photon_keyboard;
SDLKey keymap[SDL_NUM_SCANCODES]; SDLKey keymap[SDL_NUM_SCANCODES];
uint32_t it; uint32_t it;
for (it=0; it<_this->num_displays; it++) for (it = 0; it < _this->num_displays; it++) {
{ /* Clear SDL mouse structure */
/* Clear SDL mouse structure */ SDL_memset(&photon_mouse, 0x00, sizeof(struct SDL_Mouse));
SDL_memset(&photon_mouse, 0x00, sizeof(struct SDL_Mouse));
/* Allocate SDL_MouseData structure */
/* Allocate SDL_MouseData structure */ mdata = (SDL_MouseData *) SDL_calloc(1, sizeof(SDL_MouseData));
mdata=(SDL_MouseData*)SDL_calloc(1, sizeof(SDL_MouseData)); if (mdata == NULL) {
if (mdata==NULL) SDL_OutOfMemory();
{ return -1;
SDL_OutOfMemory(); }
return -1;
} /* Mark this mouse with ID 0 */
photon_mouse.id = it;
/* Mark this mouse with ID 0 */ photon_mouse.driverdata = (void *) mdata;
photon_mouse.id=it; photon_mouse.CreateCursor = photon_createcursor;
photon_mouse.driverdata=(void*)mdata; photon_mouse.ShowCursor = photon_showcursor;
photon_mouse.CreateCursor=photon_createcursor; photon_mouse.MoveCursor = photon_movecursor;
photon_mouse.ShowCursor=photon_showcursor; photon_mouse.FreeCursor = photon_freecursor;
photon_mouse.MoveCursor=photon_movecursor; photon_mouse.WarpMouse = photon_warpmouse;
photon_mouse.FreeCursor=photon_freecursor; photon_mouse.FreeMouse = photon_freemouse;
photon_mouse.WarpMouse=photon_warpmouse;
photon_mouse.FreeMouse=photon_freemouse; /* Get display data */
didata = (SDL_DisplayData *) _this->displays[it].driverdata;
/* Get display data */
didata=(SDL_DisplayData*)_this->displays[it].driverdata; /* Store SDL_DisplayData pointer in the mouse driver internals */
mdata->didata = didata;
/* Store SDL_DisplayData pointer in the mouse driver internals */
mdata->didata=didata; /* Register mouse cursor in SDL */
SDL_AddMouse(&photon_mouse, "Photon mouse cursor", 0, 0, 1);
/* Register mouse cursor in SDL */ }
SDL_AddMouse(&photon_mouse, "Photon mouse cursor", 0, 0, 1);
} /* Photon maps all keyboards to one */
SDL_zero(photon_keyboard);
/* Photon maps all keyboards to one */ SDL_AddKeyboard(&photon_keyboard, -1);
SDL_zero(photon_keyboard);
SDL_AddKeyboard(&photon_keyboard, -1); /* Add default scancode to key mapping */
SDL_GetDefaultKeymap(keymap);
/* Add default scancode to key mapping */ SDL_SetKeymap(0, 0, keymap, SDL_NUM_SCANCODES);
SDL_GetDefaultKeymap(keymap);
SDL_SetKeymap(0, 0, keymap, SDL_NUM_SCANCODES); return 0;
return 0;
} }
int32_t photon_delinputdevices(_THIS) int32_t
photon_delinputdevices(_THIS)
{ {
/* Destroy all of the mice */ /* Destroy all of the mice */
SDL_MouseQuit(); SDL_MouseQuit();
} }
/*****************************************************************************/ /*****************************************************************************/
/* Photon mouse related functions */ /* Photon mouse related functions */
/*****************************************************************************/ /*****************************************************************************/
SDL_Cursor* photon_createcursor(SDL_Surface* surface, int hot_x, int hot_y) SDL_Cursor *
photon_createcursor(SDL_Surface * surface, int hot_x, int hot_y)
{ {
PhCursorDef_t* internal_cursor; PhCursorDef_t *internal_cursor;
SDL_Cursor* sdl_cursor; SDL_Cursor *sdl_cursor;
uint8_t* image0=NULL; uint8_t *image0 = NULL;
uint8_t* image1=NULL; uint8_t *image1 = NULL;
uint32_t it; uint32_t it;
uint32_t jt; uint32_t jt;
uint32_t shape_color; uint32_t shape_color;
/* SDL converts monochrome cursor shape to 32bpp cursor shape */ /* SDL converts monochrome cursor shape to 32bpp cursor shape */
/* and we must convert it back to monochrome, this routine handles */ /* and we must convert it back to monochrome, this routine handles */
/* 24/32bpp surfaces only */ /* 24/32bpp surfaces only */
if ((surface->format->BitsPerPixel!=32) && (surface->format->BitsPerPixel!=24)) if ((surface->format->BitsPerPixel != 32)
{ && (surface->format->BitsPerPixel != 24)) {
SDL_SetError("Photon: Cursor shape is not 24/32bpp."); SDL_SetError("Photon: Cursor shape is not 24/32bpp.");
return NULL; return NULL;
} }
/* Checking data parameters */ /* Checking data parameters */
if ((surface->w==0) || (surface->h==0)) if ((surface->w == 0) || (surface->h == 0)) {
{ SDL_SetError("Photon: Cursor shape dimensions are zero");
SDL_SetError("Photon: Cursor shape dimensions are zero"); return NULL;
return NULL; }
}
/* Allocate memory for the internal cursor format */
/* Allocate memory for the internal cursor format */ internal_cursor = (PhCursorDef_t *) SDL_calloc(1, sizeof(PhCursorDef_t) +
internal_cursor=(PhCursorDef_t*)SDL_calloc(1, sizeof(PhCursorDef_t)+ ((((surface->w +
((((surface->w+7)>>3)*surface->h)*2)-1); 7) >> 3) *
if (internal_cursor==NULL) surface->h) * 2) - 1);
{ if (internal_cursor == NULL) {
SDL_OutOfMemory(); SDL_OutOfMemory();
return NULL; return NULL;
} }
/* Allocate memory for the SDL cursor */ /* Allocate memory for the SDL cursor */
sdl_cursor=(SDL_Cursor*)SDL_calloc(1, sizeof(SDL_Cursor)); sdl_cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(SDL_Cursor));
if (sdl_cursor==NULL) if (sdl_cursor == NULL) {
{ SDL_free(internal_cursor);
SDL_free(internal_cursor); SDL_OutOfMemory();
SDL_OutOfMemory(); return NULL;
return NULL; }
}
/* Set driverdata as photon cursor format */
/* Set driverdata as photon cursor format */ image0 = (uint8_t *) internal_cursor;
image0=(uint8_t*)internal_cursor; image0 += sizeof(PhCursorDef_t) - 1;
image0+=sizeof(PhCursorDef_t)-1; image1 = image0;
image1=image0; image1 += ((surface->w + 7) >> 3) * surface->h;
image1+=((surface->w+7)>>3)*surface->h; sdl_cursor->driverdata = (void *) internal_cursor;
sdl_cursor->driverdata=(void*)internal_cursor; internal_cursor->hdr.len =
internal_cursor->hdr.len=(sizeof(PhCursorDef_t)-sizeof(PhRegionDataHdr_t))+ (sizeof(PhCursorDef_t) - sizeof(PhRegionDataHdr_t)) +
((((surface->w+7)>>3)*surface->h)*2)-1; ((((surface->w + 7) >> 3) * surface->h) * 2) - 1;
internal_cursor->hdr.type=Ph_RDATA_CURSOR; internal_cursor->hdr.type = Ph_RDATA_CURSOR;
internal_cursor->size1.x=surface->w; internal_cursor->size1.x = surface->w;
internal_cursor->size1.y=surface->h; internal_cursor->size1.y = surface->h;
internal_cursor->size2.x=surface->w; internal_cursor->size2.x = surface->w;
internal_cursor->size2.y=surface->h; internal_cursor->size2.y = surface->h;
internal_cursor->offset1.x=hot_x; internal_cursor->offset1.x = hot_x;
internal_cursor->offset1.y=hot_y; internal_cursor->offset1.y = hot_y;
internal_cursor->offset2.x=hot_x; internal_cursor->offset2.x = hot_x;
internal_cursor->offset2.y=hot_y; internal_cursor->offset2.y = hot_y;
internal_cursor->bytesperline1=((surface->w+7)>>3); internal_cursor->bytesperline1 = ((surface->w + 7) >> 3);
internal_cursor->bytesperline2=((surface->w+7)>>3); internal_cursor->bytesperline2 = ((surface->w + 7) >> 3);
internal_cursor->color1=(SDL_PHOTON_MOUSE_COLOR_BLACK) & 0x00FFFFFF; internal_cursor->color1 = (SDL_PHOTON_MOUSE_COLOR_BLACK) & 0x00FFFFFF;
internal_cursor->color2=(SDL_PHOTON_MOUSE_COLOR_WHITE) & 0x00FFFFFF; internal_cursor->color2 = (SDL_PHOTON_MOUSE_COLOR_WHITE) & 0x00FFFFFF;
/* Convert cursor from 32 bpp */ /* Convert cursor from 32 bpp */
for (jt=0; jt<surface->h; jt++) for (jt = 0; jt < surface->h; jt++) {
{ for (it = 0; it < surface->w; it++) {
for (it=0; it<surface->w; it++) shape_color =
{ *((uint32_t *) ((uint8_t *) surface->pixels +
shape_color=*((uint32_t*)((uint8_t*)surface->pixels+jt*surface->pitch+it*surface->format->BytesPerPixel)); jt * surface->pitch +
switch(shape_color) it * surface->format->BytesPerPixel));
{ switch (shape_color) {
case SDL_PHOTON_MOUSE_COLOR_BLACK: case SDL_PHOTON_MOUSE_COLOR_BLACK:
{ {
*(image0+jt*(internal_cursor->bytesperline1)+(it>>3))|=0x80>>(it%8); *(image0 + jt * (internal_cursor->bytesperline1) +
*(image1+jt*(internal_cursor->bytesperline2)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) |= 0x80 >> (it % 8);
} *(image1 + jt * (internal_cursor->bytesperline2) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
}
break;
case SDL_PHOTON_MOUSE_COLOR_WHITE: case SDL_PHOTON_MOUSE_COLOR_WHITE:
{ {
*(image0+jt*(internal_cursor->bytesperline1)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->bytesperline1) +
*(image1+jt*(internal_cursor->bytesperline2)+(it>>3))|=0x80>>(it%8); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->bytesperline2) +
break; (it >> 3)) |= 0x80 >> (it % 8);
}
break;
case SDL_PHOTON_MOUSE_COLOR_TRANS: case SDL_PHOTON_MOUSE_COLOR_TRANS:
{ {
*(image0+jt*(internal_cursor->bytesperline1)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->bytesperline1) +
*(image1+jt*(internal_cursor->bytesperline2)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->bytesperline2) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
}
break;
default: default:
{ {
/* The same as transparent color, must not happen */ /* The same as transparent color, must not happen */
*(image0+jt*(internal_cursor->bytesperline1)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->bytesperline1) +
*(image1+jt*(internal_cursor->bytesperline2)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->bytesperline2) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
} }
} break;
} }
}
return sdl_cursor; }
return sdl_cursor;
} }
int photon_showcursor(SDL_Cursor* cursor) int
photon_showcursor(SDL_Cursor * cursor)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
SDL_WindowData* wdata; SDL_WindowData *wdata;
SDL_WindowID window_id; SDL_WindowID window_id;
PhCursorDef_t* internal_cursor; PhCursorDef_t *internal_cursor;
int32_t status; int32_t status;
/* Get current window id */ /* Get current window id */
window_id=SDL_GetFocusWindow(); window_id = SDL_GetFocusWindow();
if (window_id<=0) if (window_id <= 0) {
{ SDL_MouseData *mdata = NULL;
SDL_MouseData* mdata=NULL;
/* If there is no current window, then someone calls this function */
/* If there is no current window, then someone calls this function */ /* to set global mouse settings during SDL initialization */
/* to set global mouse settings during SDL initialization */ if (cursor != NULL) {
if (cursor!=NULL) /* Store cursor for future usage */
{ mdata = (SDL_MouseData *) cursor->mouse->driverdata;
/* Store cursor for future usage */ didata = (SDL_DisplayData *) mdata->didata;
mdata=(SDL_MouseData*)cursor->mouse->driverdata; internal_cursor = (PhCursorDef_t *) cursor->driverdata;
didata=(SDL_DisplayData*)mdata->didata;
internal_cursor=(PhCursorDef_t*)cursor->driverdata; if (didata->cursor_size >=
(internal_cursor->hdr.len + sizeof(PhRegionDataHdr_t))) {
if (didata->cursor_size>=(internal_cursor->hdr.len+sizeof(PhRegionDataHdr_t))) SDL_memcpy(didata->cursor, internal_cursor,
{ internal_cursor->hdr.len +
SDL_memcpy(didata->cursor, internal_cursor, internal_cursor->hdr.len+sizeof(PhRegionDataHdr_t)); sizeof(PhRegionDataHdr_t));
} } else {
else /* Partitial cursor image */
{ SDL_memcpy(didata->cursor, internal_cursor,
/* Partitial cursor image */ didata->cursor_size);
SDL_memcpy(didata->cursor, internal_cursor, didata->cursor_size);
}
didata->cursor_visible=SDL_TRUE;
return 0;
}
else
{
/* We can't get SDL_DisplayData at this point, return fake success */
return 0;
}
}
else
{
/* Sanity checks */
window=SDL_GetWindowFromID(window_id);
if (window!=NULL)
{
display=SDL_GetDisplayFromWindow(window);
if (display!=NULL)
{
didata=(SDL_DisplayData*)display->driverdata;
if (didata!=NULL)
{
wdata=(SDL_WindowData*)window->driverdata;
if (wdata==NULL)
{
return -1;
}
} }
else
{ didata->cursor_visible = SDL_TRUE;
return -1; return 0;
} else {
/* We can't get SDL_DisplayData at this point, return fake success */
return 0;
}
} else {
/* Sanity checks */
window = SDL_GetWindowFromID(window_id);
if (window != NULL) {
display = SDL_GetDisplayFromWindow(window);
if (display != NULL) {
didata = (SDL_DisplayData *) display->driverdata;
if (didata != NULL) {
wdata = (SDL_WindowData *) window->driverdata;
if (wdata == NULL) {
return -1;
}
} else {
return -1;
}
} else {
return -1;
} }
} } else {
else
{
return -1; return -1;
} }
} }
else
{ /* return if window widget has been destroyed already */
return -1; if (wdata->window == NULL) {
} return;
} }
/* return if window widget has been destroyed already */ /* Check if we need to set new shape or disable cursor shape */
if (wdata->window==NULL) if (cursor != NULL) {
{ /* Retrieve photon cursor shape */
return; internal_cursor = (PhCursorDef_t *) cursor->driverdata;
} if (internal_cursor == NULL) {
SDL_SetError("Photon: Internal cursor data is absent");
/* Check if we need to set new shape or disable cursor shape */ return -1;
if (cursor!=NULL) }
{
/* Retrieve photon cursor shape */ /* Setup cursor type */
internal_cursor=(PhCursorDef_t*)cursor->driverdata; status =
if (internal_cursor==NULL) PtSetResource(wdata->window, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_BITMAP,
{ 0);
SDL_SetError("Photon: Internal cursor data is absent"); if (status != 0) {
return -1; SDL_SetError("Photon: Failed to set cursor type to bitmap");
} return -1;
}
/* Setup cursor type */
status=PtSetResource(wdata->window, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_BITMAP, 0); /* Setup cursor color to default */
if (status!=0) status =
{ PtSetResource(wdata->window, Pt_ARG_CURSOR_COLOR,
SDL_SetError("Photon: Failed to set cursor type to bitmap"); Ph_CURSOR_DEFAULT_COLOR, 0);
return -1; if (status != 0) {
} SDL_SetError("Photon: Failed to set cursor color");
return -1;
/* Setup cursor color to default */ }
status=PtSetResource(wdata->window, Pt_ARG_CURSOR_COLOR, Ph_CURSOR_DEFAULT_COLOR, 0);
if (status!=0) /* Setup cursor shape */
{ status =
SDL_SetError("Photon: Failed to set cursor color"); PtSetResource(wdata->window, Pt_ARG_BITMAP_CURSOR,
return -1; internal_cursor,
} internal_cursor->hdr.len +
sizeof(PhRegionDataHdr_t));
/* Setup cursor shape */ if (status != 0) {
status=PtSetResource(wdata->window, Pt_ARG_BITMAP_CURSOR, internal_cursor, SDL_SetError("Photon: Failed to set cursor color");
internal_cursor->hdr.len+sizeof(PhRegionDataHdr_t)); return -1;
if (status!=0) }
{
SDL_SetError("Photon: Failed to set cursor color"); /* Store current cursor for future usage */
return -1; if (didata->cursor_size >=
} (internal_cursor->hdr.len + sizeof(PhRegionDataHdr_t))) {
SDL_memcpy(didata->cursor, internal_cursor,
/* Store current cursor for future usage */ internal_cursor->hdr.len + sizeof(PhRegionDataHdr_t));
if (didata->cursor_size>=(internal_cursor->hdr.len+sizeof(PhRegionDataHdr_t))) } else {
{ /* Partitial cursor image */
SDL_memcpy(didata->cursor, internal_cursor, internal_cursor->hdr.len+sizeof(PhRegionDataHdr_t)); SDL_memcpy(didata->cursor, internal_cursor, didata->cursor_size);
} }
else
{ /* Set cursor visible */
/* Partitial cursor image */ didata->cursor_visible = SDL_TRUE;
SDL_memcpy(didata->cursor, internal_cursor, didata->cursor_size); } else {
} /* SDL requests to disable cursor */
status =
/* Set cursor visible */ PtSetResource(wdata->window, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_NONE,
didata->cursor_visible=SDL_TRUE; 0);
} if (status != 0) {
else SDL_SetError("Photon: Can't disable cursor");
{ return -1;
/* SDL requests to disable cursor */ }
status=PtSetResource(wdata->window, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_NONE, 0);
if (status!=0) /* Set cursor invisible */
{ didata->cursor_visible = SDL_FALSE;
SDL_SetError("Photon: Can't disable cursor"); }
return -1;
} /* Flush all pending widget data */
PtFlush();
/* Set cursor invisible */
didata->cursor_visible=SDL_FALSE; /* New cursor shape is set */
} return 0;
/* Flush all pending widget data */
PtFlush();
/* New cursor shape is set */
return 0;
} }
void photon_movecursor(SDL_Cursor* cursor) void
photon_movecursor(SDL_Cursor * cursor)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
SDL_WindowData* wdata; SDL_WindowData *wdata;
SDL_WindowID window_id; SDL_WindowID window_id;
int32_t status; int32_t status;
/* Get current window id */ /* Get current window id */
window_id=SDL_GetFocusWindow(); window_id = SDL_GetFocusWindow();
if (window_id<=0) if (window_id <= 0) {
{ didata = (SDL_DisplayData *) cursor->mouse->driverdata;
didata=(SDL_DisplayData*)cursor->mouse->driverdata; } else {
} /* Sanity checks */
else window = SDL_GetWindowFromID(window_id);
{ if (window != NULL) {
/* Sanity checks */ display = SDL_GetDisplayFromWindow(window);
window=SDL_GetWindowFromID(window_id); if (display != NULL) {
if (window!=NULL) didata = (SDL_DisplayData *) display->driverdata;
{ if (didata != NULL) {
display=SDL_GetDisplayFromWindow(window); wdata = (SDL_WindowData *) window->driverdata;
if (display!=NULL) if (wdata == NULL) {
{ return;
didata=(SDL_DisplayData*)display->driverdata; }
if (didata!=NULL) } else {
{ return;
wdata=(SDL_WindowData*)window->driverdata; }
if (wdata==NULL) } else {
{ return;
return;
}
} }
else } else {
{
return;
}
}
else
{
return; return;
} }
} }
else
{
return;
}
}
/* No need to move mouse cursor manually in the photon */ /* No need to move mouse cursor manually in the photon */
return; return;
} }
void photon_freecursor(SDL_Cursor* cursor) void
photon_freecursor(SDL_Cursor * cursor)
{ {
PhCursorDef_t* internal_cursor=NULL; PhCursorDef_t *internal_cursor = NULL;
if (cursor!=NULL) if (cursor != NULL) {
{ internal_cursor = (PhCursorDef_t *) cursor->driverdata;
internal_cursor=(PhCursorDef_t*)cursor->driverdata; if (internal_cursor != NULL) {
if (internal_cursor!=NULL) SDL_free(internal_cursor);
{ cursor->driverdata = NULL;
SDL_free(internal_cursor); }
cursor->driverdata=NULL; }
}
}
} }
void photon_warpmouse(SDL_Mouse* mouse, SDL_WindowID windowID, int x, int y) void
photon_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
SDL_WindowData* wdata; SDL_WindowData *wdata;
int16_t wx; int16_t wx;
int16_t wy; int16_t wy;
/* Sanity checks */ /* Sanity checks */
window=SDL_GetWindowFromID(windowID); window = SDL_GetWindowFromID(windowID);
if (window!=NULL) if (window != NULL) {
{ display = SDL_GetDisplayFromWindow(window);
display=SDL_GetDisplayFromWindow(window); if (display != NULL) {
if (display!=NULL) didata = (SDL_DisplayData *) display->driverdata;
{ if (didata != NULL) {
didata=(SDL_DisplayData*)display->driverdata; wdata = (SDL_WindowData *) window->driverdata;
if (didata!=NULL) if (wdata == NULL) {
{ return;
wdata=(SDL_WindowData*)window->driverdata; }
if (wdata==NULL) } else {
{ return;
return;
} }
} } else {
else
{
return; return;
} }
} } else {
else return;
{ }
return;
} PtGetAbsPosition(wdata->window, &wx, &wy);
} PhMoveCursorAbs(PhInputGroup(NULL), wx + x, wy + y);
else
{ return;
return;
}
PtGetAbsPosition(wdata->window, &wx, &wy);
PhMoveCursorAbs(PhInputGroup(NULL), wx+x, wy+y);
return;
} }
void photon_freemouse(SDL_Mouse* mouse) void
photon_freemouse(SDL_Mouse * mouse)
{ {
if (mouse->driverdata==NULL) if (mouse->driverdata == NULL) {
{ return;
return; }
}
/* Mouse framework doesn't deletes automatically our driverdata */ /* Mouse framework doesn't deletes automatically our driverdata */
SDL_free(mouse->driverdata); SDL_free(mouse->driverdata);
mouse->driverdata=NULL; mouse->driverdata = NULL;
return; return;
} }
SDL_scancode photon_to_sdl_keymap(uint32_t key) SDL_scancode
photon_to_sdl_keymap(uint32_t key)
{ {
SDL_scancode scancode=SDL_SCANCODE_UNKNOWN; SDL_scancode scancode = SDL_SCANCODE_UNKNOWN;
switch(key & 0x0000007F) switch (key & 0x0000007F) {
{ case PHOTON_SCANCODE_ESCAPE:
case PHOTON_SCANCODE_ESCAPE: scancode = SDL_SCANCODE_ESCAPE;
scancode=SDL_SCANCODE_ESCAPE; break;
break; case PHOTON_SCANCODE_F1:
case PHOTON_SCANCODE_F1: scancode = SDL_SCANCODE_F1;
scancode=SDL_SCANCODE_F1; break;
break; case PHOTON_SCANCODE_F2:
case PHOTON_SCANCODE_F2: scancode = SDL_SCANCODE_F2;
scancode=SDL_SCANCODE_F2; break;
break; case PHOTON_SCANCODE_F3:
case PHOTON_SCANCODE_F3: scancode = SDL_SCANCODE_F3;
scancode=SDL_SCANCODE_F3; break;
break; case PHOTON_SCANCODE_F4:
case PHOTON_SCANCODE_F4: scancode = SDL_SCANCODE_F4;
scancode=SDL_SCANCODE_F4; break;
break; case PHOTON_SCANCODE_F5:
case PHOTON_SCANCODE_F5: scancode = SDL_SCANCODE_F5;
scancode=SDL_SCANCODE_F5; break;
break; case PHOTON_SCANCODE_F6:
case PHOTON_SCANCODE_F6: scancode = SDL_SCANCODE_F6;
scancode=SDL_SCANCODE_F6; break;
break; case PHOTON_SCANCODE_F7:
case PHOTON_SCANCODE_F7: scancode = SDL_SCANCODE_F7;
scancode=SDL_SCANCODE_F7; break;
break; case PHOTON_SCANCODE_F8:
case PHOTON_SCANCODE_F8: scancode = SDL_SCANCODE_F8;
scancode=SDL_SCANCODE_F8; break;
break; case PHOTON_SCANCODE_F9:
case PHOTON_SCANCODE_F9: scancode = SDL_SCANCODE_F9;
scancode=SDL_SCANCODE_F9; break;
break; case PHOTON_SCANCODE_F10:
case PHOTON_SCANCODE_F10: scancode = SDL_SCANCODE_F10;
scancode=SDL_SCANCODE_F10; break;
break; case PHOTON_SCANCODE_F11:
case PHOTON_SCANCODE_F11: scancode = SDL_SCANCODE_F11;
scancode=SDL_SCANCODE_F11; break;
break; case PHOTON_SCANCODE_F12:
case PHOTON_SCANCODE_F12: scancode = SDL_SCANCODE_F12;
scancode=SDL_SCANCODE_F12; break;
break; case PHOTON_SCANCODE_BACKQOUTE:
case PHOTON_SCANCODE_BACKQOUTE: scancode = SDL_SCANCODE_GRAVE;
scancode=SDL_SCANCODE_GRAVE; break;
break; case PHOTON_SCANCODE_1:
case PHOTON_SCANCODE_1: scancode = SDL_SCANCODE_1;
scancode=SDL_SCANCODE_1; break;
break; case PHOTON_SCANCODE_2:
case PHOTON_SCANCODE_2: scancode = SDL_SCANCODE_2;
scancode=SDL_SCANCODE_2; break;
break; case PHOTON_SCANCODE_3:
case PHOTON_SCANCODE_3: scancode = SDL_SCANCODE_3;
scancode=SDL_SCANCODE_3; break;
break; case PHOTON_SCANCODE_4:
case PHOTON_SCANCODE_4: scancode = SDL_SCANCODE_4;
scancode=SDL_SCANCODE_4; break;
break; case PHOTON_SCANCODE_5:
case PHOTON_SCANCODE_5: scancode = SDL_SCANCODE_5;
scancode=SDL_SCANCODE_5; break;
break; case PHOTON_SCANCODE_6:
case PHOTON_SCANCODE_6: scancode = SDL_SCANCODE_6;
scancode=SDL_SCANCODE_6; break;
break; case PHOTON_SCANCODE_7:
case PHOTON_SCANCODE_7: scancode = SDL_SCANCODE_7;
scancode=SDL_SCANCODE_7; break;
break; case PHOTON_SCANCODE_8:
case PHOTON_SCANCODE_8: scancode = SDL_SCANCODE_8;
scancode=SDL_SCANCODE_8; break;
break; case PHOTON_SCANCODE_9:
case PHOTON_SCANCODE_9: scancode = SDL_SCANCODE_9;
scancode=SDL_SCANCODE_9; break;
break; case PHOTON_SCANCODE_0:
case PHOTON_SCANCODE_0: scancode = SDL_SCANCODE_0;
scancode=SDL_SCANCODE_0; break;
break; case PHOTON_SCANCODE_MINUS:
case PHOTON_SCANCODE_MINUS: scancode = SDL_SCANCODE_MINUS;
scancode=SDL_SCANCODE_MINUS; break;
break; case PHOTON_SCANCODE_EQUAL:
case PHOTON_SCANCODE_EQUAL: scancode = SDL_SCANCODE_EQUALS;
scancode=SDL_SCANCODE_EQUALS; break;
break; case PHOTON_SCANCODE_BACKSPACE:
case PHOTON_SCANCODE_BACKSPACE: scancode = SDL_SCANCODE_BACKSPACE;
scancode=SDL_SCANCODE_BACKSPACE; break;
break; case PHOTON_SCANCODE_TAB:
case PHOTON_SCANCODE_TAB: scancode = SDL_SCANCODE_TAB;
scancode=SDL_SCANCODE_TAB; break;
break; case PHOTON_SCANCODE_Q:
case PHOTON_SCANCODE_Q: scancode = SDL_SCANCODE_Q;
scancode=SDL_SCANCODE_Q; break;
break; case PHOTON_SCANCODE_W:
case PHOTON_SCANCODE_W: scancode = SDL_SCANCODE_W;
scancode=SDL_SCANCODE_W; break;
break; case PHOTON_SCANCODE_E:
case PHOTON_SCANCODE_E: scancode = SDL_SCANCODE_E;
scancode=SDL_SCANCODE_E; break;
break; case PHOTON_SCANCODE_R:
case PHOTON_SCANCODE_R: scancode = SDL_SCANCODE_R;
scancode=SDL_SCANCODE_R; break;
break; case PHOTON_SCANCODE_T:
case PHOTON_SCANCODE_T: scancode = SDL_SCANCODE_T;
scancode=SDL_SCANCODE_T; break;
break; case PHOTON_SCANCODE_Y:
case PHOTON_SCANCODE_Y: scancode = SDL_SCANCODE_Y;
scancode=SDL_SCANCODE_Y; break;
break; case PHOTON_SCANCODE_U:
case PHOTON_SCANCODE_U: scancode = SDL_SCANCODE_U;
scancode=SDL_SCANCODE_U; break;
break; case PHOTON_SCANCODE_I:
case PHOTON_SCANCODE_I: scancode = SDL_SCANCODE_I;
scancode=SDL_SCANCODE_I; break;
break; case PHOTON_SCANCODE_O:
case PHOTON_SCANCODE_O: scancode = SDL_SCANCODE_O;
scancode=SDL_SCANCODE_O; break;
break; case PHOTON_SCANCODE_P:
case PHOTON_SCANCODE_P: scancode = SDL_SCANCODE_P;
scancode=SDL_SCANCODE_P; break;
break; case PHOTON_SCANCODE_LEFT_SQ_BR:
case PHOTON_SCANCODE_LEFT_SQ_BR: scancode = SDL_SCANCODE_LEFTBRACKET;
scancode=SDL_SCANCODE_LEFTBRACKET; break;
break; case PHOTON_SCANCODE_RIGHT_SQ_BR:
case PHOTON_SCANCODE_RIGHT_SQ_BR: scancode = SDL_SCANCODE_RIGHTBRACKET;
scancode=SDL_SCANCODE_RIGHTBRACKET; break;
break; case PHOTON_SCANCODE_ENTER:
case PHOTON_SCANCODE_ENTER: scancode = SDL_SCANCODE_RETURN;
scancode=SDL_SCANCODE_RETURN; break;
break; case PHOTON_SCANCODE_CAPSLOCK:
case PHOTON_SCANCODE_CAPSLOCK: scancode = SDL_SCANCODE_CAPSLOCK;
scancode=SDL_SCANCODE_CAPSLOCK; break;
break; case PHOTON_SCANCODE_A:
case PHOTON_SCANCODE_A: scancode = SDL_SCANCODE_A;
scancode=SDL_SCANCODE_A; break;
break; case PHOTON_SCANCODE_S:
case PHOTON_SCANCODE_S: scancode = SDL_SCANCODE_S;
scancode=SDL_SCANCODE_S; break;
break; case PHOTON_SCANCODE_D:
case PHOTON_SCANCODE_D: scancode = SDL_SCANCODE_D;
scancode=SDL_SCANCODE_D; break;
break; case PHOTON_SCANCODE_F:
case PHOTON_SCANCODE_F: scancode = SDL_SCANCODE_F;
scancode=SDL_SCANCODE_F; break;
break; case PHOTON_SCANCODE_G:
case PHOTON_SCANCODE_G: scancode = SDL_SCANCODE_G;
scancode=SDL_SCANCODE_G; break;
break; case PHOTON_SCANCODE_H:
case PHOTON_SCANCODE_H: scancode = SDL_SCANCODE_H;
scancode=SDL_SCANCODE_H; break;
break; case PHOTON_SCANCODE_J:
case PHOTON_SCANCODE_J: scancode = SDL_SCANCODE_J;
scancode=SDL_SCANCODE_J; break;
break; case PHOTON_SCANCODE_K:
case PHOTON_SCANCODE_K: scancode = SDL_SCANCODE_K;
scancode=SDL_SCANCODE_K; break;
break; case PHOTON_SCANCODE_L:
case PHOTON_SCANCODE_L: scancode = SDL_SCANCODE_L;
scancode=SDL_SCANCODE_L; break;
break; case PHOTON_SCANCODE_SEMICOLON:
case PHOTON_SCANCODE_SEMICOLON: scancode = SDL_SCANCODE_SEMICOLON;
scancode=SDL_SCANCODE_SEMICOLON; break;
break; case PHOTON_SCANCODE_QUOTE:
case PHOTON_SCANCODE_QUOTE: scancode = SDL_SCANCODE_APOSTROPHE;
scancode=SDL_SCANCODE_APOSTROPHE; break;
break; case PHOTON_SCANCODE_BACKSLASH:
case PHOTON_SCANCODE_BACKSLASH: scancode = SDL_SCANCODE_BACKSLASH;
scancode=SDL_SCANCODE_BACKSLASH; break;
break; case PHOTON_SCANCODE_LEFT_SHIFT:
case PHOTON_SCANCODE_LEFT_SHIFT: scancode = SDL_SCANCODE_LSHIFT;
scancode=SDL_SCANCODE_LSHIFT; break;
break; case PHOTON_SCANCODE_Z:
case PHOTON_SCANCODE_Z: scancode = SDL_SCANCODE_Z;
scancode=SDL_SCANCODE_Z; break;
break; case PHOTON_SCANCODE_X:
case PHOTON_SCANCODE_X: scancode = SDL_SCANCODE_X;
scancode=SDL_SCANCODE_X; break;
break; case PHOTON_SCANCODE_C:
case PHOTON_SCANCODE_C: scancode = SDL_SCANCODE_C;
scancode=SDL_SCANCODE_C; break;
break; case PHOTON_SCANCODE_V:
case PHOTON_SCANCODE_V: scancode = SDL_SCANCODE_V;
scancode=SDL_SCANCODE_V; break;
break; case PHOTON_SCANCODE_B:
case PHOTON_SCANCODE_B: scancode = SDL_SCANCODE_B;
scancode=SDL_SCANCODE_B; break;
break; case PHOTON_SCANCODE_N:
case PHOTON_SCANCODE_N: scancode = SDL_SCANCODE_N;
scancode=SDL_SCANCODE_N; break;
break; case PHOTON_SCANCODE_M:
case PHOTON_SCANCODE_M: scancode = SDL_SCANCODE_M;
scancode=SDL_SCANCODE_M; break;
break; case PHOTON_SCANCODE_COMMA:
case PHOTON_SCANCODE_COMMA: scancode = SDL_SCANCODE_COMMA;
scancode=SDL_SCANCODE_COMMA; break;
break; case PHOTON_SCANCODE_POINT:
case PHOTON_SCANCODE_POINT: scancode = SDL_SCANCODE_PERIOD;
scancode=SDL_SCANCODE_PERIOD; break;
break; case PHOTON_SCANCODE_SLASH:
case PHOTON_SCANCODE_SLASH: scancode = SDL_SCANCODE_SLASH;
scancode=SDL_SCANCODE_SLASH; break;
break; case PHOTON_SCANCODE_RIGHT_SHIFT:
case PHOTON_SCANCODE_RIGHT_SHIFT: scancode = SDL_SCANCODE_RSHIFT;
scancode=SDL_SCANCODE_RSHIFT; break;
break; case PHOTON_SCANCODE_CTRL:
case PHOTON_SCANCODE_CTRL: scancode = SDL_SCANCODE_LCTRL;
scancode=SDL_SCANCODE_LCTRL; break;
break; case PHOTON_SCANCODE_WFLAG:
case PHOTON_SCANCODE_WFLAG: scancode = SDL_SCANCODE_LGUI;
scancode=SDL_SCANCODE_LGUI; break;
break; case PHOTON_SCANCODE_ALT:
case PHOTON_SCANCODE_ALT: scancode = SDL_SCANCODE_LALT;
scancode=SDL_SCANCODE_LALT; break;
break; case PHOTON_SCANCODE_SPACE:
case PHOTON_SCANCODE_SPACE: scancode = SDL_SCANCODE_SPACE;
scancode=SDL_SCANCODE_SPACE; break;
break; case PHOTON_SCANCODE_MENU:
case PHOTON_SCANCODE_MENU: scancode = SDL_SCANCODE_MENU;
scancode=SDL_SCANCODE_MENU; break;
break; case PHOTON_SCANCODE_PRNSCR:
case PHOTON_SCANCODE_PRNSCR: scancode = SDL_SCANCODE_PRINTSCREEN;
scancode=SDL_SCANCODE_PRINTSCREEN; break;
break; case PHOTON_SCANCODE_SCROLLLOCK:
case PHOTON_SCANCODE_SCROLLLOCK: scancode = SDL_SCANCODE_SCROLLLOCK;
scancode=SDL_SCANCODE_SCROLLLOCK; break;
break; case PHOTON_SCANCODE_INSERT:
case PHOTON_SCANCODE_INSERT: scancode = SDL_SCANCODE_INSERT;
scancode=SDL_SCANCODE_INSERT; break;
break; case PHOTON_SCANCODE_HOME:
case PHOTON_SCANCODE_HOME: scancode = SDL_SCANCODE_HOME;
scancode=SDL_SCANCODE_HOME; break;
break; case PHOTON_SCANCODE_PAGEUP:
case PHOTON_SCANCODE_PAGEUP: scancode = SDL_SCANCODE_PAGEUP;
scancode=SDL_SCANCODE_PAGEUP; break;
break; case PHOTON_SCANCODE_DELETE:
case PHOTON_SCANCODE_DELETE: scancode = SDL_SCANCODE_DELETE;
scancode=SDL_SCANCODE_DELETE; break;
break; case PHOTON_SCANCODE_END:
case PHOTON_SCANCODE_END: scancode = SDL_SCANCODE_END;
scancode=SDL_SCANCODE_END; break;
break; case PHOTON_SCANCODE_PAGEDOWN:
case PHOTON_SCANCODE_PAGEDOWN: scancode = SDL_SCANCODE_PAGEDOWN;
scancode=SDL_SCANCODE_PAGEDOWN; break;
break; case PHOTON_SCANCODE_UP:
case PHOTON_SCANCODE_UP: scancode = SDL_SCANCODE_UP;
scancode=SDL_SCANCODE_UP; break;
break; case PHOTON_SCANCODE_DOWN:
case PHOTON_SCANCODE_DOWN: scancode = SDL_SCANCODE_DOWN;
scancode=SDL_SCANCODE_DOWN; break;
break; case PHOTON_SCANCODE_LEFT:
case PHOTON_SCANCODE_LEFT: scancode = SDL_SCANCODE_LEFT;
scancode=SDL_SCANCODE_LEFT; break;
break; case PHOTON_SCANCODE_RIGHT:
case PHOTON_SCANCODE_RIGHT: scancode = SDL_SCANCODE_RIGHT;
scancode=SDL_SCANCODE_RIGHT; break;
break; case PHOTON_SCANCODE_NUMLOCK:
case PHOTON_SCANCODE_NUMLOCK: scancode = SDL_SCANCODE_NUMLOCKCLEAR;
scancode=SDL_SCANCODE_NUMLOCKCLEAR; break;
break; default:
default: break;
break; }
}
return scancode;
return scancode;
} }
src/video/photon/SDL_photon_input.h
View file @ 483f2ba3
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
typedef struct SDL_MouseData typedef struct SDL_MouseData
{ {
SDL_DisplayData* didata; SDL_DisplayData *didata;
} SDL_MouseData; } SDL_MouseData;
int32_t photon_addinputdevices(_THIS); int32_t photon_addinputdevices(_THIS);
......
src/video/photon/SDL_photon_keycodes.h
View file @ 483f2ba3
...@@ -104,9 +104,11 @@ ...@@ -104,9 +104,11 @@
#define PHOTON_SCANCODE_SPACE 0x39 #define PHOTON_SCANCODE_SPACE 0x39
#define PHOTON_SCANCODE_MENU 0x5D #define PHOTON_SCANCODE_MENU 0x5D
#define PHOTON_SCANCODE_PRNSCR 0x54 /* only key pressed event, no release */ #define PHOTON_SCANCODE_PRNSCR 0x54 /* only key pressed event, no release */
#define PHOTON_SCANCODE_SCROLLLOCK 0x46 #define PHOTON_SCANCODE_SCROLLLOCK 0x46
/* #define PHOTON_SCANCODE_PAUSE 0x?? */ /* pause doesn't generates a scancode */ #if 0 /* pause doesn't generates a scancode */
#define PHOTON_SCANCODE_PAUSE 0x??
#endif
#define PHOTON_SCANCODE_INSERT 0x52 #define PHOTON_SCANCODE_INSERT 0x52
#define PHOTON_SCANCODE_HOME 0x47 #define PHOTON_SCANCODE_HOME 0x47
#define PHOTON_SCANCODE_PAGEUP 0x49 #define PHOTON_SCANCODE_PAGEUP 0x49
......
src/video/photon/SDL_photon_pixelfmt.c
View file @ 483f2ba3
...@@ -26,173 +26,173 @@ ...@@ -26,173 +26,173 @@
#include "SDL_photon_pixelfmt.h" #include "SDL_photon_pixelfmt.h"
uint32_t photon_bits_to_sdl_pixelformat(uint32_t pixelfmt) uint32_t
photon_bits_to_sdl_pixelformat(uint32_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case 8:
case 8: {
{ return SDL_PIXELFORMAT_INDEX8;
return SDL_PIXELFORMAT_INDEX8; }
} break;
break; case 15:
case 15: {
{ return SDL_PIXELFORMAT_ARGB1555;
return SDL_PIXELFORMAT_ARGB1555; }
} break;
break; case 16:
case 16: {
{ return SDL_PIXELFORMAT_RGB565;
return SDL_PIXELFORMAT_RGB565; }
} break;
break; case 24:
case 24: {
{ return SDL_PIXELFORMAT_RGB888;
return SDL_PIXELFORMAT_RGB888; }
} break;
break; case 32:
case 32: {
{ return SDL_PIXELFORMAT_ARGB8888;
return SDL_PIXELFORMAT_ARGB8888; }
} break;
break; }
}
} }
uint32_t photon_sdl_to_bits_pixelformat(uint32_t pixelfmt) uint32_t
photon_sdl_to_bits_pixelformat(uint32_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case SDL_PIXELFORMAT_INDEX8:
case SDL_PIXELFORMAT_INDEX8: {
{ return 8;
return 8; }
} break;
break; case SDL_PIXELFORMAT_ARGB1555:
case SDL_PIXELFORMAT_ARGB1555: {
{ return 15;
return 15; }
} break;
break; case SDL_PIXELFORMAT_ABGR1555:
case SDL_PIXELFORMAT_ABGR1555: {
{ return 15;
return 15; }
} break;
break; case SDL_PIXELFORMAT_RGB565:
case SDL_PIXELFORMAT_RGB565: {
{ return 16;
return 16; }
} break;
break; case SDL_PIXELFORMAT_RGB888:
case SDL_PIXELFORMAT_RGB888: {
{ return 24;
return 24; }
} break;
break; case SDL_PIXELFORMAT_BGRA8888:
case SDL_PIXELFORMAT_BGRA8888: {
{ return 32;
return 32; }
} break;
break; case SDL_PIXELFORMAT_ARGB8888:
case SDL_PIXELFORMAT_ARGB8888: {
{ return 32;
return 32; }
} break;
break; case SDL_PIXELFORMAT_YV12:
case SDL_PIXELFORMAT_YV12: {
{ return 8;
return 8; }
} break;
break; case SDL_PIXELFORMAT_YUY2:
case SDL_PIXELFORMAT_YUY2: {
{ return 16;
return 16; }
} break;
break; case SDL_PIXELFORMAT_UYVY:
case SDL_PIXELFORMAT_UYVY: {
{ return 16;
return 16; }
} break;
break; case SDL_PIXELFORMAT_YVYU:
case SDL_PIXELFORMAT_YVYU: {
{ return 16;
return 16; }
} break;
break; }
}
return 0; return 0;
} }
uint32_t photon_image_to_sdl_pixelformat(uint32_t pixelfmt) uint32_t
photon_image_to_sdl_pixelformat(uint32_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case Pg_IMAGE_PALETTE_BYTE:
case Pg_IMAGE_PALETTE_BYTE: {
{ return SDL_PIXELFORMAT_INDEX8;
return SDL_PIXELFORMAT_INDEX8; }
} break;
break; case Pg_IMAGE_DIRECT_8888:
case Pg_IMAGE_DIRECT_8888: {
{ return SDL_PIXELFORMAT_BGRA8888;
return SDL_PIXELFORMAT_BGRA8888; }
} break;
break; case Pg_IMAGE_DIRECT_888:
case Pg_IMAGE_DIRECT_888: {
{ return SDL_PIXELFORMAT_RGB888;
return SDL_PIXELFORMAT_RGB888; }
} break;
break; case Pg_IMAGE_DIRECT_565:
case Pg_IMAGE_DIRECT_565: {
{ return SDL_PIXELFORMAT_RGB565;
return SDL_PIXELFORMAT_RGB565; }
} break;
break; case Pg_IMAGE_DIRECT_555:
case Pg_IMAGE_DIRECT_555: {
{ return SDL_PIXELFORMAT_RGB555;
return SDL_PIXELFORMAT_RGB555; }
} break;
break; case Pg_IMAGE_DIRECT_1555:
case Pg_IMAGE_DIRECT_1555: {
{ return SDL_PIXELFORMAT_ARGB1555;
return SDL_PIXELFORMAT_ARGB1555; }
} break;
break; }
}
return 0; return 0;
} }
uint32_t photon_sdl_to_image_pixelformat(uint32_t pixelfmt) uint32_t
photon_sdl_to_image_pixelformat(uint32_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case SDL_PIXELFORMAT_INDEX8:
case SDL_PIXELFORMAT_INDEX8: {
{ return Pg_IMAGE_PALETTE_BYTE;
return Pg_IMAGE_PALETTE_BYTE; }
} break;
break; case SDL_PIXELFORMAT_BGRA8888:
case SDL_PIXELFORMAT_BGRA8888: {
{ return Pg_IMAGE_DIRECT_8888;
return Pg_IMAGE_DIRECT_8888; }
} break;
break; case SDL_PIXELFORMAT_RGB888:
case SDL_PIXELFORMAT_RGB888: {
{ return Pg_IMAGE_DIRECT_888;
return Pg_IMAGE_DIRECT_888; }
} break;
break; case SDL_PIXELFORMAT_RGB565:
case SDL_PIXELFORMAT_RGB565: {
{ return Pg_IMAGE_DIRECT_565;
return Pg_IMAGE_DIRECT_565; }
} break;
break; case SDL_PIXELFORMAT_ARGB1555:
case SDL_PIXELFORMAT_ARGB1555: {
{ return Pg_IMAGE_DIRECT_1555;
return Pg_IMAGE_DIRECT_1555; }
} break;
break; }
}
return 0; return 0;
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/video/photon/SDL_photon_render.c
View file @ 483f2ba3
...@@ -34,308 +34,343 @@ ...@@ -34,308 +34,343 @@
#include "SDL_photon_render.h" #include "SDL_photon_render.h"
#include "SDL_photon.h" #include "SDL_photon.h"
static SDL_Renderer* photon_createrenderer(SDL_Window* window, Uint32 flags); static SDL_Renderer *photon_createrenderer(SDL_Window * window, Uint32 flags);
static int photon_displaymodechanged(SDL_Renderer* renderer); static int photon_displaymodechanged(SDL_Renderer * renderer);
static int photon_activaterenderer(SDL_Renderer* renderer); static int photon_activaterenderer(SDL_Renderer * renderer);
static int photon_createtexture(SDL_Renderer* renderer, SDL_Texture* texture); static int photon_createtexture(SDL_Renderer * renderer,
static int photon_querytexturepixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch); SDL_Texture * texture);
static int photon_settexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color* colors, int firstcolor, int ncolors); static int photon_querytexturepixels(SDL_Renderer * renderer,
static int photon_gettexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Color* colors, int firstcolor, int ncolors); SDL_Texture * texture, void **pixels,
static int photon_settexturecolormod(SDL_Renderer* renderer, SDL_Texture* texture); int *pitch);
static int photon_settexturealphamod(SDL_Renderer* renderer, SDL_Texture* texture); static int photon_settexturepalette(SDL_Renderer * renderer,
static int photon_settextureblendmode(SDL_Renderer* renderer, SDL_Texture* texture); SDL_Texture * texture,
static int photon_settexturescalemode(SDL_Renderer* renderer, SDL_Texture* texture); const SDL_Color * colors, int firstcolor,
static int photon_updatetexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch); int ncolors);
static int photon_locktexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int markDirty, void** pixels, int* pitch); static int photon_gettexturepalette(SDL_Renderer * renderer,
static void photon_unlocktexture(SDL_Renderer* renderer, SDL_Texture* texture); SDL_Texture * texture, SDL_Color * colors,
static void photon_dirtytexture(SDL_Renderer* renderer, SDL_Texture* texture, int numrects, const SDL_Rect* rects); int firstcolor, int ncolors);
static int photon_renderpoint(SDL_Renderer* renderer, int x, int y); static int photon_settexturecolormod(SDL_Renderer * renderer,
static int photon_renderline(SDL_Renderer* renderer, int x1, int y1, int x2, int y2); SDL_Texture * texture);
static int photon_renderfill(SDL_Renderer* renderer, const SDL_Rect* rect); static int photon_settexturealphamod(SDL_Renderer * renderer,
static int photon_rendercopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srcrect, const SDL_Rect* dstrect); SDL_Texture * texture);
static void photon_renderpresent(SDL_Renderer* renderer); static int photon_settextureblendmode(SDL_Renderer * renderer,
static void photon_destroytexture(SDL_Renderer* renderer, SDL_Texture* texture); SDL_Texture * texture);
static void photon_destroyrenderer(SDL_Renderer* renderer); static int photon_settexturescalemode(SDL_Renderer * renderer,
SDL_Texture * texture);
SDL_RenderDriver photon_renderdriver= static int photon_updatetexture(SDL_Renderer * renderer,
{ SDL_Texture * texture, const SDL_Rect * rect,
const void *pixels, int pitch);
static int photon_locktexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, int markDirty,
void **pixels, int *pitch);
static void photon_unlocktexture(SDL_Renderer * renderer,
SDL_Texture * texture);
static void photon_dirtytexture(SDL_Renderer * renderer,
SDL_Texture * texture, int numrects,
const SDL_Rect * rects);
static int photon_renderpoint(SDL_Renderer * renderer, int x, int y);
static int photon_renderline(SDL_Renderer * renderer, int x1, int y1, int x2,
int y2);
static int photon_renderfill(SDL_Renderer * renderer, const SDL_Rect * rect);
static int photon_rendercopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect,
const SDL_Rect * dstrect);
static void photon_renderpresent(SDL_Renderer * renderer);
static void photon_destroytexture(SDL_Renderer * renderer,
SDL_Texture * texture);
static void photon_destroyrenderer(SDL_Renderer * renderer);
SDL_RenderDriver photon_renderdriver = {
photon_createrenderer, photon_createrenderer,
{ {
"photon", "photon",
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY | (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 |
SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD |
SDL_RENDERER_ACCELERATED), SDL_RENDERER_ACCELERATED),
(SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR |
SDL_TEXTUREMODULATE_ALPHA), SDL_TEXTUREMODULATE_ALPHA),
(SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | (SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK |
SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD), SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
(SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_SLOW), (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_SLOW),
13, 13,
{ {
SDL_PIXELFORMAT_INDEX8, SDL_PIXELFORMAT_INDEX8,
SDL_PIXELFORMAT_RGB555, SDL_PIXELFORMAT_RGB555,
SDL_PIXELFORMAT_RGB565, SDL_PIXELFORMAT_RGB565,
SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888,
SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888,
SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888,
SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGBA8888,
SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888,
SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGRA8888,
SDL_PIXELFORMAT_YV12, SDL_PIXELFORMAT_YV12,
SDL_PIXELFORMAT_YUY2, SDL_PIXELFORMAT_YUY2,
SDL_PIXELFORMAT_UYVY, SDL_PIXELFORMAT_UYVY,
SDL_PIXELFORMAT_YVYU SDL_PIXELFORMAT_YVYU},
}, 0,
0, 0}
0
}
}; };
static SDL_Renderer* photon_createrenderer(SDL_Window* window, Uint32 flags) static SDL_Renderer *
photon_createrenderer(SDL_Window * window, Uint32 flags)
{ {
SDL_VideoDisplay* display = SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_DisplayData* didata = (SDL_DisplayData*)display->driverdata; SDL_DisplayData *didata = (SDL_DisplayData *) display->driverdata;
SDL_WindowData* wdata = (SDL_WindowData*)window->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
SDL_Renderer* renderer = NULL; SDL_Renderer *renderer = NULL;
SDL_RenderData* rdata = NULL; SDL_RenderData *rdata = NULL;
/* Allocate new renderer structure */ /* Allocate new renderer structure */
renderer=(SDL_Renderer*)SDL_calloc(1, sizeof(SDL_Renderer)); renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(SDL_Renderer));
if (renderer==NULL) if (renderer == NULL) {
{ SDL_OutOfMemory();
SDL_OutOfMemory(); return NULL;
return NULL; }
}
/* Allocate renderer data */
/* Allocate renderer data */ rdata = (SDL_RenderData *) SDL_calloc(1, sizeof(SDL_RenderData));
rdata=(SDL_RenderData*)SDL_calloc(1, sizeof(SDL_RenderData)); if (rdata == NULL) {
if (rdata==NULL) SDL_free(renderer);
{ SDL_OutOfMemory();
SDL_free(renderer); return NULL;
SDL_OutOfMemory(); }
return NULL;
} renderer->DisplayModeChanged = photon_displaymodechanged;
renderer->ActivateRenderer = photon_activaterenderer;
renderer->DisplayModeChanged=photon_displaymodechanged; renderer->CreateTexture = photon_createtexture;
renderer->ActivateRenderer=photon_activaterenderer; renderer->QueryTexturePixels = photon_querytexturepixels;
renderer->CreateTexture=photon_createtexture; renderer->SetTexturePalette = photon_settexturepalette;
renderer->QueryTexturePixels=photon_querytexturepixels; renderer->GetTexturePalette = photon_gettexturepalette;
renderer->SetTexturePalette=photon_settexturepalette; renderer->SetTextureAlphaMod = photon_settexturealphamod;
renderer->GetTexturePalette=photon_gettexturepalette; renderer->SetTextureColorMod = photon_settexturecolormod;
renderer->SetTextureAlphaMod=photon_settexturealphamod; renderer->SetTextureBlendMode = photon_settextureblendmode;
renderer->SetTextureColorMod=photon_settexturecolormod; renderer->SetTextureScaleMode = photon_settexturescalemode;
renderer->SetTextureBlendMode=photon_settextureblendmode; renderer->UpdateTexture = photon_updatetexture;
renderer->SetTextureScaleMode=photon_settexturescalemode; renderer->LockTexture = photon_locktexture;
renderer->UpdateTexture=photon_updatetexture; renderer->UnlockTexture = photon_unlocktexture;
renderer->LockTexture=photon_locktexture; renderer->DirtyTexture = photon_dirtytexture;
renderer->UnlockTexture=photon_unlocktexture; renderer->RenderPoint = photon_renderpoint;
renderer->DirtyTexture=photon_dirtytexture; renderer->RenderLine = photon_renderline;
renderer->RenderPoint=photon_renderpoint; renderer->RenderFill = photon_renderfill;
renderer->RenderLine=photon_renderline; renderer->RenderCopy = photon_rendercopy;
renderer->RenderFill=photon_renderfill; renderer->RenderPresent = photon_renderpresent;
renderer->RenderCopy=photon_rendercopy; renderer->DestroyTexture = photon_destroytexture;
renderer->RenderPresent = photon_renderpresent; renderer->DestroyRenderer = photon_destroyrenderer;
renderer->DestroyTexture = photon_destroytexture; renderer->info = photon_renderdriver.info;
renderer->DestroyRenderer = photon_destroyrenderer; renderer->window = window->id;
renderer->info = photon_renderdriver.info; renderer->driverdata = rdata;
renderer->window = window->id;
renderer->driverdata = rdata; /* Set render acceleration flag in case it is accelerated */
if ((didata->caps & SDL_PHOTON_ACCELERATED) == SDL_PHOTON_ACCELERATED) {
/* Set render acceleration flag in case it is accelerated */ renderer->info.flags = SDL_RENDERER_ACCELERATED;
if ((didata->caps & SDL_PHOTON_ACCELERATED)==SDL_PHOTON_ACCELERATED) } else {
{ renderer->info.flags &= ~(SDL_RENDERER_ACCELERATED);
renderer->info.flags=SDL_RENDERER_ACCELERATED; }
}
else rdata->window = window;
{
renderer->info.flags&=~(SDL_RENDERER_ACCELERATED); /* Check if upper level requested synchronization on vsync signal */
} if ((flags & SDL_RENDERER_PRESENTVSYNC) == SDL_RENDERER_PRESENTVSYNC) {
rdata->enable_vsync = SDL_TRUE;
rdata->window=window; } else {
rdata->enable_vsync = SDL_FALSE;
/* Check if upper level requested synchronization on vsync signal */ }
if ((flags & SDL_RENDERER_PRESENTVSYNC)==SDL_RENDERER_PRESENTVSYNC)
{ /* Check what buffer copy/flip scheme is requested */
rdata->enable_vsync=SDL_TRUE; rdata->surfaces_count = 0;
} if ((flags & SDL_RENDERER_SINGLEBUFFER) == SDL_RENDERER_SINGLEBUFFER) {
else if ((flags & SDL_RENDERER_PRESENTDISCARD) ==
{ SDL_RENDERER_PRESENTDISCARD) {
rdata->enable_vsync=SDL_FALSE; renderer->info.flags |=
} SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD;
} else {
/* Check what buffer copy/flip scheme is requested */ renderer->info.flags |=
rdata->surfaces_count=0; SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY;
if ((flags & SDL_RENDERER_SINGLEBUFFER)==SDL_RENDERER_SINGLEBUFFER) }
{ rdata->surfaces_count = 1;
if ((flags & SDL_RENDERER_PRESENTDISCARD)==SDL_RENDERER_PRESENTDISCARD) rdata->surface_visible_idx = 0;
{ rdata->surface_render_idx = 0;
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD; } else {
} if ((flags & SDL_RENDERER_PRESENTFLIP2) == SDL_RENDERER_PRESENTFLIP2) {
else renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
{ rdata->surfaces_count = 2;
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY; rdata->surface_visible_idx = 0;
} rdata->surface_render_idx = 1;
rdata->surfaces_count=1; } else {
rdata->surface_visible_idx=0; if ((flags & SDL_RENDERER_PRESENTFLIP3) ==
rdata->surface_render_idx=0; SDL_RENDERER_PRESENTFLIP3) {
} renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
else rdata->surfaces_count = 3;
{ rdata->surface_visible_idx = 0;
if ((flags & SDL_RENDERER_PRESENTFLIP2)==SDL_RENDERER_PRESENTFLIP2) rdata->surface_render_idx = 1;
{ } else {
renderer->info.flags|=SDL_RENDERER_PRESENTFLIP2; renderer->info.flags |=
rdata->surfaces_count=2; SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY;
rdata->surface_visible_idx=0; rdata->surfaces_count = 1;
rdata->surface_render_idx=1; rdata->surface_visible_idx = 0;
} rdata->surface_render_idx = 0;
else }
{ }
if ((flags & SDL_RENDERER_PRESENTFLIP3)==SDL_RENDERER_PRESENTFLIP3) }
{
renderer->info.flags|=SDL_RENDERER_PRESENTFLIP3; return renderer;
rdata->surfaces_count=3;
rdata->surface_visible_idx=0;
rdata->surface_render_idx=1;
}
else
{
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY;
rdata->surfaces_count=1;
rdata->surface_visible_idx=0;
rdata->surface_render_idx=0;
}
}
}
return renderer;
} }
void photon_addrenderdriver(_THIS) void
photon_addrenderdriver(_THIS)
{ {
uint32_t it; uint32_t it;
for (it=0; it<_this->num_displays; it++) for (it = 0; it < _this->num_displays; it++) {
{ SDL_AddRenderDriver(it, &photon_renderdriver);
SDL_AddRenderDriver(it, &photon_renderdriver); }
}
} }
/****************************************************************************/ /****************************************************************************/
/* SDL render interface */ /* SDL render interface */
/****************************************************************************/ /****************************************************************************/
static int photon_displaymodechanged(SDL_Renderer* renderer) static int
photon_displaymodechanged(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
/* Remove all allocated surfaces, they are no more valid */ /* Remove all allocated surfaces, they are no more valid */
/* TODO: Add video mode change detection and new parameters detection */ /* TODO: Add video mode change detection and new parameters detection */
return 0; return 0;
} }
static int photon_activaterenderer(SDL_Renderer* renderer) static int
photon_activaterenderer(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
SDL_VideoDisplay* display = SDL_GetDisplayFromWindow(rdata->window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(rdata->window);
SDL_DisplayData* didata = (SDL_DisplayData*)display->driverdata; SDL_DisplayData *didata = (SDL_DisplayData *) display->driverdata;
return 0; return 0;
} }
static int photon_createtexture(SDL_Renderer* renderer, SDL_Texture* texture) static int
photon_createtexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
SDL_RenderData* renderdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *renderdata = (SDL_RenderData *) renderer->driverdata;
SDL_Window* window=SDL_GetWindowFromID(renderer->window); SDL_Window *window = SDL_GetWindowFromID(renderer->window);
SDL_VideoDisplay* display=SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_TextureData* tdata=NULL; SDL_TextureData *tdata = NULL;
/* Allocate texture driver data */ /* Allocate texture driver data */
tdata=(SDL_TextureData*)SDL_calloc(1, sizeof(SDL_TextureData)); tdata = (SDL_TextureData *) SDL_calloc(1, sizeof(SDL_TextureData));
if (tdata==NULL) if (tdata == NULL) {
{ SDL_OutOfMemory();
SDL_OutOfMemory(); return -1;
return -1; }
}
/* Set texture driver data */
/* Set texture driver data */ texture->driverdata = tdata;
texture->driverdata=tdata;
} }
static int photon_querytexturepixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch) static int
photon_querytexturepixels(SDL_Renderer * renderer, SDL_Texture * texture,
void **pixels, int *pitch)
{ {
} }
static int photon_settexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color* colors, int firstcolor, int ncolors) static int
photon_settexturepalette(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Color * colors, int firstcolor,
int ncolors)
{ {
} }
static int photon_gettexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Color* colors, int firstcolor, int ncolors) static int
photon_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture,
SDL_Color * colors, int firstcolor, int ncolors)
{ {
} }
static int photon_settexturecolormod(SDL_Renderer* renderer, SDL_Texture* texture) static int
photon_settexturecolormod(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int photon_settexturealphamod(SDL_Renderer* renderer, SDL_Texture* texture) static int
photon_settexturealphamod(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int photon_settextureblendmode(SDL_Renderer* renderer, SDL_Texture* texture) static int
photon_settextureblendmode(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int photon_settexturescalemode(SDL_Renderer* renderer, SDL_Texture* texture) static int
photon_settexturescalemode(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int photon_updatetexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch) static int
photon_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels, int pitch)
{ {
} }
static int photon_locktexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int markDirty, void** pixels, int* pitch) static int
photon_locktexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, int markDirty, void **pixels,
int *pitch)
{ {
} }
static void photon_unlocktexture(SDL_Renderer* renderer, SDL_Texture* texture) static void
photon_unlocktexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static void photon_dirtytexture(SDL_Renderer* renderer, SDL_Texture* texture, int numrects, const SDL_Rect* rects) static void
photon_dirtytexture(SDL_Renderer * renderer, SDL_Texture * texture,
int numrects, const SDL_Rect * rects)
{ {
} }
static int photon_renderpoint(SDL_Renderer* renderer, int x, int y) static int
photon_renderpoint(SDL_Renderer * renderer, int x, int y)
{ {
} }
static int photon_renderline(SDL_Renderer* renderer, int x1, int y1, int x2, int y2) static int
photon_renderline(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
{ {
} }
static int photon_renderfill(SDL_Renderer* renderer, const SDL_Rect* rect) static int
photon_renderfill(SDL_Renderer * renderer, const SDL_Rect * rect)
{ {
} }
static int photon_rendercopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srcrect, const SDL_Rect* dstrect) static int
photon_rendercopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect, const SDL_Rect * dstrect)
{ {
} }
static void photon_renderpresent(SDL_Renderer* renderer) static void
photon_renderpresent(SDL_Renderer * renderer)
{ {
} }
static void photon_destroytexture(SDL_Renderer* renderer, SDL_Texture* texture) static void
photon_destroytexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static void photon_destroyrenderer(SDL_Renderer* renderer) static void
photon_destroyrenderer(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
uint32_t it; uint32_t it;
} }
......
src/video/photon/SDL_photon_render.h
View file @ 483f2ba3
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
typedef struct SDL_RenderData typedef struct SDL_RenderData
{ {
SDL_Window* window; /* SDL window type */ SDL_Window *window; /* SDL window type */
SDL_bool enable_vsync; /* VSYNC flip synchronization enable */ SDL_bool enable_vsync; /* VSYNC flip synchronization enable */
uint32_t surface_visible_idx; /* Index of visible surface */ uint32_t surface_visible_idx; /* Index of visible surface */
uint32_t surface_render_idx; /* Index of render surface */ uint32_t surface_render_idx; /* Index of render surface */
uint32_t surfaces_count; /* Amount of allocated surfaces */ uint32_t surfaces_count; /* Amount of allocated surfaces */
} SDL_RenderData; } SDL_RenderData;
typedef struct SDL_TextureData typedef struct SDL_TextureData
......
src/video/qnxgf/SDL_gf_input.c
View file @ 483f2ba3
...@@ -37,539 +37,491 @@ ...@@ -37,539 +37,491 @@
#include "SDL_hiddi_joystick.h" #include "SDL_hiddi_joystick.h"
/* Mouse related functions */ /* Mouse related functions */
SDL_Cursor* gf_createcursor(SDL_Surface* surface, int hot_x, int hot_y); SDL_Cursor *gf_createcursor(SDL_Surface * surface, int hot_x, int hot_y);
int gf_showcursor(SDL_Cursor* cursor); int gf_showcursor(SDL_Cursor * cursor);
void gf_movecursor(SDL_Cursor* cursor); void gf_movecursor(SDL_Cursor * cursor);
void gf_freecursor(SDL_Cursor* cursor); void gf_freecursor(SDL_Cursor * cursor);
void gf_warpmouse(SDL_Mouse* mouse, SDL_WindowID windowID, int x, int y); void gf_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y);
void gf_freemouse(SDL_Mouse* mouse); void gf_freemouse(SDL_Mouse * mouse);
/* HIDDI interacting functions */ /* HIDDI interacting functions */
static int32_t hiddi_connect_devices(); static int32_t hiddi_connect_devices();
static int32_t hiddi_disconnect_devices(); static int32_t hiddi_disconnect_devices();
int32_t gf_addinputdevices(_THIS) int32_t
gf_addinputdevices(_THIS)
{ {
SDL_VideoData* gfdata=(SDL_VideoData*)_this->driverdata; SDL_VideoData *gfdata = (SDL_VideoData *) _this->driverdata;
SDL_DisplayData* didata; SDL_DisplayData *didata;
struct SDL_Mouse gf_mouse; struct SDL_Mouse gf_mouse;
SDL_Keyboard gf_keyboard; SDL_Keyboard gf_keyboard;
SDLKey keymap[SDL_NUM_SCANCODES]; SDLKey keymap[SDL_NUM_SCANCODES];
SDL_MouseData* mdata; SDL_MouseData *mdata;
uint32_t it; uint32_t it;
for (it=0; it<_this->num_displays; it++) for (it = 0; it < _this->num_displays; it++) {
{ /* Clear SDL mouse structure */
/* Clear SDL mouse structure */ SDL_memset(&gf_mouse, 0x00, sizeof(struct SDL_Mouse));
SDL_memset(&gf_mouse, 0x00, sizeof(struct SDL_Mouse));
/* Allocate SDL_MouseData structure */
/* Allocate SDL_MouseData structure */ mdata = (SDL_MouseData *) SDL_calloc(1, sizeof(SDL_MouseData));
mdata=(SDL_MouseData*)SDL_calloc(1, sizeof(SDL_MouseData)); if (mdata == NULL) {
if (mdata==NULL) SDL_OutOfMemory();
{ return -1;
SDL_OutOfMemory(); }
return -1;
} /* Mark this mouse with ID 0 */
gf_mouse.id = it;
/* Mark this mouse with ID 0 */ gf_mouse.driverdata = (void *) mdata;
gf_mouse.id=it; gf_mouse.CreateCursor = gf_createcursor;
gf_mouse.driverdata=(void*)mdata; gf_mouse.ShowCursor = gf_showcursor;
gf_mouse.CreateCursor=gf_createcursor; gf_mouse.MoveCursor = gf_movecursor;
gf_mouse.ShowCursor=gf_showcursor; gf_mouse.FreeCursor = gf_freecursor;
gf_mouse.MoveCursor=gf_movecursor; gf_mouse.WarpMouse = gf_warpmouse;
gf_mouse.FreeCursor=gf_freecursor; gf_mouse.FreeMouse = gf_freemouse;
gf_mouse.WarpMouse=gf_warpmouse;
gf_mouse.FreeMouse=gf_freemouse; /* Get display data */
didata = (SDL_DisplayData *) _this->displays[it].driverdata;
/* Get display data */
didata=(SDL_DisplayData*)_this->displays[it].driverdata; /* Store SDL_DisplayData pointer in the mouse driver internals */
mdata->didata = didata;
/* Store SDL_DisplayData pointer in the mouse driver internals */
mdata->didata=didata; /* Set cursor pos to 0,0 to avoid cursor disappearing in some drivers */
gf_cursor_set_pos(didata->display, 0, 0, 0);
/* Set cursor pos to 0,0 to avoid cursor disappearing in some drivers */
gf_cursor_set_pos(didata->display, 0, 0, 0); /* Register mouse cursor in SDL */
SDL_AddMouse(&gf_mouse, "GF mouse cursor", 0, 0, 1);
/* Register mouse cursor in SDL */ }
SDL_AddMouse(&gf_mouse, "GF mouse cursor", 0, 0, 1);
} /* Keyboard could be one only */
SDL_zero(gf_keyboard);
/* Keyboard could be one only */ SDL_AddKeyboard(&gf_keyboard, -1);
SDL_zero(gf_keyboard);
SDL_AddKeyboard(&gf_keyboard, -1); /* Add scancode to key mapping, HIDDI uses USB HID codes, so */
/* map will be exact one-to-one */
/* Add scancode to key mapping, HIDDI uses USB HID codes, so */ SDL_GetDefaultKeymap(keymap);
/* map will be exact one-to-one */ SDL_SetKeymap(0, 0, keymap, SDL_NUM_SCANCODES);
SDL_GetDefaultKeymap(keymap);
SDL_SetKeymap(0, 0, keymap, SDL_NUM_SCANCODES); /* Connect to HID server and enumerate all input devices */
hiddi_connect_devices();
/* Connect to HID server and enumerate all input devices */
hiddi_connect_devices(); return 0;
return 0;
} }
int32_t gf_delinputdevices(_THIS) int32_t
gf_delinputdevices(_THIS)
{ {
/* Disconnect from HID server and release input devices */ /* Disconnect from HID server and release input devices */
hiddi_disconnect_devices(); hiddi_disconnect_devices();
/* Delete keyboard */ /* Delete keyboard */
SDL_KeyboardQuit(); SDL_KeyboardQuit();
/* Destroy all of the mice */ /* Destroy all of the mice */
SDL_MouseQuit(); SDL_MouseQuit();
} }
/*****************************************************************************/ /*****************************************************************************/
/* GF Mouse related functions */ /* GF Mouse related functions */
/*****************************************************************************/ /*****************************************************************************/
SDL_Cursor* gf_createcursor(SDL_Surface* surface, int hot_x, int hot_y) SDL_Cursor *
gf_createcursor(SDL_Surface * surface, int hot_x, int hot_y)
{ {
gf_cursor_t* internal_cursor; gf_cursor_t *internal_cursor;
SDL_Cursor* sdl_cursor; SDL_Cursor *sdl_cursor;
uint8_t* image0=NULL; uint8_t *image0 = NULL;
uint8_t* image1=NULL; uint8_t *image1 = NULL;
uint32_t it; uint32_t it;
uint32_t jt; uint32_t jt;
uint32_t shape_color; uint32_t shape_color;
/* SDL converts monochrome cursor shape to 32bpp cursor shape */ /* SDL converts monochrome cursor shape to 32bpp cursor shape */
/* and we must convert it back to monochrome, this routine handles */ /* and we must convert it back to monochrome, this routine handles */
/* 24/32bpp surfaces only */ /* 24/32bpp surfaces only */
if ((surface->format->BitsPerPixel!=32) && (surface->format->BitsPerPixel!=24)) if ((surface->format->BitsPerPixel != 32)
{ && (surface->format->BitsPerPixel != 24)) {
SDL_SetError("GF: Cursor shape is not 24/32bpp."); SDL_SetError("GF: Cursor shape is not 24/32bpp.");
return NULL; return NULL;
} }
/* Since GF is not checking data, we must check */ /* Since GF is not checking data, we must check */
if ((surface->w==0) || (surface->h==0)) if ((surface->w == 0) || (surface->h == 0)) {
{ SDL_SetError("GF: Cursor shape dimensions are zero");
SDL_SetError("GF: Cursor shape dimensions are zero"); return NULL;
return NULL; }
}
/* Allocate memory for the internal cursor format */
/* Allocate memory for the internal cursor format */ internal_cursor = (gf_cursor_t *) SDL_calloc(1, sizeof(gf_cursor_t));
internal_cursor=(gf_cursor_t*)SDL_calloc(1, sizeof(gf_cursor_t)); if (internal_cursor == NULL) {
if (internal_cursor==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_OutOfMemory(); }
return NULL;
} /* Allocate memory for the SDL cursor */
sdl_cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(SDL_Cursor));
/* Allocate memory for the SDL cursor */ if (sdl_cursor == NULL) {
sdl_cursor=(SDL_Cursor*)SDL_calloc(1, sizeof(SDL_Cursor)); SDL_free(internal_cursor);
if (sdl_cursor==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_free(internal_cursor); }
SDL_OutOfMemory();
return NULL; /* Allocate two monochrome images */
} image0 = (uint8_t *) SDL_calloc(1, ((surface->w + 7) / 8) * surface->h);
if (image0 == NULL) {
/* Allocate two monochrome images */ SDL_free(sdl_cursor);
image0=(uint8_t*)SDL_calloc(1, ((surface->w+7)/8)*surface->h); SDL_free(internal_cursor);
if (image0==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_free(sdl_cursor); }
SDL_free(internal_cursor); image1 = (uint8_t *) SDL_calloc(1, ((surface->w + 7) >> 3) * surface->h);
SDL_OutOfMemory(); if (image1 == NULL) {
return NULL; SDL_free(image0);
} SDL_free(sdl_cursor);
image1=(uint8_t*)SDL_calloc(1, ((surface->w+7)>>3)*surface->h); SDL_free(internal_cursor);
if (image1==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_free(image0); }
SDL_free(sdl_cursor);
SDL_free(internal_cursor); /* Set driverdata as GF cursor format */
SDL_OutOfMemory(); sdl_cursor->driverdata = (void *) internal_cursor;
return NULL; internal_cursor->type = GF_CURSOR_BITMAP;
} internal_cursor->hotspot.x = hot_x;
internal_cursor->hotspot.y = hot_y;
/* Set driverdata as GF cursor format */ internal_cursor->cursor.bitmap.w = surface->w;
sdl_cursor->driverdata=(void*)internal_cursor; internal_cursor->cursor.bitmap.h = surface->h;
internal_cursor->type=GF_CURSOR_BITMAP; internal_cursor->cursor.bitmap.color0 = SDL_GF_MOUSE_COLOR_BLACK;
internal_cursor->hotspot.x=hot_x; internal_cursor->cursor.bitmap.color1 = SDL_GF_MOUSE_COLOR_WHITE;
internal_cursor->hotspot.y=hot_y;
internal_cursor->cursor.bitmap.w=surface->w; /* Setup cursor shape images */
internal_cursor->cursor.bitmap.h=surface->h; internal_cursor->cursor.bitmap.stride = ((surface->w + 7) >> 3);
internal_cursor->cursor.bitmap.color0=SDL_GF_MOUSE_COLOR_BLACK; internal_cursor->cursor.bitmap.image0 = image0;
internal_cursor->cursor.bitmap.color1=SDL_GF_MOUSE_COLOR_WHITE; internal_cursor->cursor.bitmap.image1 = image1;
/* Setup cursor shape images */ /* Convert cursor from 32 bpp */
internal_cursor->cursor.bitmap.stride=((surface->w+7)>>3); for (jt = 0; jt < surface->h; jt++) {
internal_cursor->cursor.bitmap.image0=image0; for (it = 0; it < surface->w; it++) {
internal_cursor->cursor.bitmap.image1=image1; shape_color =
*((uint32_t *) ((uint8_t *) surface->pixels +
/* Convert cursor from 32 bpp */ jt * surface->pitch +
for (jt=0; jt<surface->h; jt++) it * surface->format->BytesPerPixel));
{ switch (shape_color) {
for (it=0; it<surface->w; it++)
{
shape_color=*((uint32_t*)((uint8_t*)surface->pixels+jt*surface->pitch+it*surface->format->BytesPerPixel));
switch(shape_color)
{
case SDL_GF_MOUSE_COLOR_BLACK: case SDL_GF_MOUSE_COLOR_BLACK:
{ {
*(image0+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))|=0x80>>(it%8); *(image0 + jt * (internal_cursor->cursor.bitmap.stride) +
*(image1+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) |= 0x80 >> (it % 8);
} *(image1 + jt * (internal_cursor->cursor.bitmap.stride) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
}
break;
case SDL_GF_MOUSE_COLOR_WHITE: case SDL_GF_MOUSE_COLOR_WHITE:
{ {
*(image0+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->cursor.bitmap.stride) +
*(image1+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))|=0x80>>(it%8); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->cursor.bitmap.stride) +
break; (it >> 3)) |= 0x80 >> (it % 8);
}
break;
case SDL_GF_MOUSE_COLOR_TRANS: case SDL_GF_MOUSE_COLOR_TRANS:
{ {
*(image0+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->cursor.bitmap.stride) +
*(image1+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->cursor.bitmap.stride) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
}
break;
default: default:
{ {
/* The same as transparent color, must not happen */ /* The same as transparent color, must not happen */
*(image0+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); *(image0 + jt * (internal_cursor->cursor.bitmap.stride) +
*(image1+jt*(internal_cursor->cursor.bitmap.stride)+(it>>3))&=~(0x80>>(it%8)); (it >> 3)) &= ~(0x80 >> (it % 8));
} *(image1 + jt * (internal_cursor->cursor.bitmap.stride) +
break; (it >> 3)) &= ~(0x80 >> (it % 8));
} }
} break;
} }
}
return sdl_cursor; }
return sdl_cursor;
} }
int gf_showcursor(SDL_Cursor* cursor) int
gf_showcursor(SDL_Cursor * cursor)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
SDL_WindowID window_id; SDL_WindowID window_id;
gf_cursor_t* internal_cursor; gf_cursor_t *internal_cursor;
int32_t status; int32_t status;
/* Get current window id */ /* Get current window id */
window_id=SDL_GetFocusWindow(); window_id = SDL_GetFocusWindow();
if (window_id<=0) if (window_id <= 0) {
{ SDL_MouseData *mdata = NULL;
SDL_MouseData* mdata=NULL;
/* If there is no current window, then someone calls this function */
/* If there is no current window, then someone calls this function */ /* to set global mouse settings during SDL initialization */
/* to set global mouse settings during SDL initialization */ if (cursor != NULL) {
if (cursor!=NULL) mdata = (SDL_MouseData *) cursor->mouse->driverdata;
{ didata = (SDL_DisplayData *) mdata->didata;
mdata=(SDL_MouseData*)cursor->mouse->driverdata; if ((didata == NULL) || (mdata == NULL)) {
didata=(SDL_DisplayData*)mdata->didata; return;
if ((didata==NULL) || (mdata==NULL))
{
return;
}
}
else
{
/* We can't get SDL_DisplayData at this point, return fake success */
return 0;
}
}
else
{
/* Sanity checks */
window=SDL_GetWindowFromID(window_id);
if (window!=NULL)
{
display=SDL_GetDisplayFromWindow(window);
if (display!=NULL)
{
didata=(SDL_DisplayData*)display->driverdata;
if (didata==NULL)
{
return -1;
} }
} } else {
else /* We can't get SDL_DisplayData at this point, return fake success */
{ return 0;
return -1; }
} } else {
} /* Sanity checks */
else window = SDL_GetWindowFromID(window_id);
{ if (window != NULL) {
return -1; display = SDL_GetDisplayFromWindow(window);
} if (display != NULL) {
} didata = (SDL_DisplayData *) display->driverdata;
if (didata == NULL) {
/* Check if we need to set new shape or disable cursor shape */ return -1;
if (cursor!=NULL) }
{ } else {
/* Retrieve GF cursor shape */ return -1;
internal_cursor=(gf_cursor_t*)cursor->driverdata; }
if (internal_cursor==NULL) } else {
{
SDL_SetError("GF: Internal cursor data is absent");
return -1;
}
if ((internal_cursor->cursor.bitmap.image0==NULL) ||
(internal_cursor->cursor.bitmap.image1==NULL))
{
SDL_SetError("GF: Cursor shape is absent");
return -1;
}
/* Store last shown cursor to display data */
didata->cursor.type=internal_cursor->type;
didata->cursor.hotspot.x=internal_cursor->hotspot.x;
didata->cursor.hotspot.y=internal_cursor->hotspot.y;
if (internal_cursor->cursor.bitmap.w>SDL_VIDEO_GF_MAX_CURSOR_SIZE)
{
didata->cursor.cursor.bitmap.w=SDL_VIDEO_GF_MAX_CURSOR_SIZE;
}
else
{
didata->cursor.cursor.bitmap.w=internal_cursor->cursor.bitmap.w;
}
if (didata->cursor.cursor.bitmap.h>SDL_VIDEO_GF_MAX_CURSOR_SIZE)
{
didata->cursor.cursor.bitmap.h=SDL_VIDEO_GF_MAX_CURSOR_SIZE;
}
else
{
didata->cursor.cursor.bitmap.h=internal_cursor->cursor.bitmap.h;
}
didata->cursor.cursor.bitmap.color0=internal_cursor->cursor.bitmap.color0;
didata->cursor.cursor.bitmap.color1=internal_cursor->cursor.bitmap.color1;
didata->cursor.cursor.bitmap.stride=internal_cursor->cursor.bitmap.stride;
SDL_memcpy(didata->cursor.cursor.bitmap.image0,
internal_cursor->cursor.bitmap.image0,
((internal_cursor->cursor.bitmap.w+7)/(sizeof(uint8_t)*8))*internal_cursor->cursor.bitmap.h);
SDL_memcpy(didata->cursor.cursor.bitmap.image1,
internal_cursor->cursor.bitmap.image1,
((internal_cursor->cursor.bitmap.w+7)/(sizeof(uint8_t)*8))*internal_cursor->cursor.bitmap.h);
/* Setup cursor shape */
status=gf_cursor_set(didata->display, 0, internal_cursor);
if (status!=GF_ERR_OK)
{
if (status!=GF_ERR_NOSUPPORT)
{
SDL_SetError("GF: Can't set hardware cursor shape");
return -1; return -1;
} }
} }
/* Enable just set cursor */ /* Check if we need to set new shape or disable cursor shape */
status=gf_cursor_enable(didata->display, 0); if (cursor != NULL) {
if (status!=GF_ERR_OK) /* Retrieve GF cursor shape */
{ internal_cursor = (gf_cursor_t *) cursor->driverdata;
if (status!=GF_ERR_NOSUPPORT) if (internal_cursor == NULL) {
{ SDL_SetError("GF: Internal cursor data is absent");
SDL_SetError("GF: Can't enable hardware cursor");
return -1; return -1;
} }
} if ((internal_cursor->cursor.bitmap.image0 == NULL) ||
(internal_cursor->cursor.bitmap.image1 == NULL)) {
/* Set cursor visible */ SDL_SetError("GF: Cursor shape is absent");
didata->cursor_visible=SDL_TRUE;
}
else
{
/* SDL requests to disable cursor */
status=gf_cursor_disable(didata->display, 0);
if (status!=GF_ERR_OK)
{
if (status!=GF_ERR_NOSUPPORT)
{
SDL_SetError("GF: Can't disable hardware cursor");
return -1; return -1;
} }
}
/* Store last shown cursor to display data */
didata->cursor.type = internal_cursor->type;
didata->cursor.hotspot.x = internal_cursor->hotspot.x;
didata->cursor.hotspot.y = internal_cursor->hotspot.y;
if (internal_cursor->cursor.bitmap.w > SDL_VIDEO_GF_MAX_CURSOR_SIZE) {
didata->cursor.cursor.bitmap.w = SDL_VIDEO_GF_MAX_CURSOR_SIZE;
} else {
didata->cursor.cursor.bitmap.w = internal_cursor->cursor.bitmap.w;
}
if (didata->cursor.cursor.bitmap.h > SDL_VIDEO_GF_MAX_CURSOR_SIZE) {
didata->cursor.cursor.bitmap.h = SDL_VIDEO_GF_MAX_CURSOR_SIZE;
} else {
didata->cursor.cursor.bitmap.h = internal_cursor->cursor.bitmap.h;
}
didata->cursor.cursor.bitmap.color0 =
internal_cursor->cursor.bitmap.color0;
didata->cursor.cursor.bitmap.color1 =
internal_cursor->cursor.bitmap.color1;
didata->cursor.cursor.bitmap.stride =
internal_cursor->cursor.bitmap.stride;
SDL_memcpy(didata->cursor.cursor.bitmap.image0,
internal_cursor->cursor.bitmap.image0,
((internal_cursor->cursor.bitmap.w +
7) / (sizeof(uint8_t) * 8)) *
internal_cursor->cursor.bitmap.h);
SDL_memcpy(didata->cursor.cursor.bitmap.image1,
internal_cursor->cursor.bitmap.image1,
((internal_cursor->cursor.bitmap.w +
7) / (sizeof(uint8_t) * 8)) *
internal_cursor->cursor.bitmap.h);
/* Setup cursor shape */
status = gf_cursor_set(didata->display, 0, internal_cursor);
if (status != GF_ERR_OK) {
if (status != GF_ERR_NOSUPPORT) {
SDL_SetError("GF: Can't set hardware cursor shape");
return -1;
}
}
/* Enable just set cursor */
status = gf_cursor_enable(didata->display, 0);
if (status != GF_ERR_OK) {
if (status != GF_ERR_NOSUPPORT) {
SDL_SetError("GF: Can't enable hardware cursor");
return -1;
}
}
/* Set cursor visible */
didata->cursor_visible = SDL_TRUE;
} else {
/* SDL requests to disable cursor */
status = gf_cursor_disable(didata->display, 0);
if (status != GF_ERR_OK) {
if (status != GF_ERR_NOSUPPORT) {
SDL_SetError("GF: Can't disable hardware cursor");
return -1;
}
}
/* Set cursor invisible */ /* Set cursor invisible */
didata->cursor_visible=SDL_FALSE; didata->cursor_visible = SDL_FALSE;
} }
/* New cursor shape is set */ /* New cursor shape is set */
return 0; return 0;
} }
void gf_movecursor(SDL_Cursor* cursor) void
gf_movecursor(SDL_Cursor * cursor)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
SDL_WindowID window_id; SDL_WindowID window_id;
int32_t status; int32_t status;
uint32_t xmax; uint32_t xmax;
uint32_t ymax; uint32_t ymax;
/* Get current window id */ /* Get current window id */
window_id=SDL_GetFocusWindow(); window_id = SDL_GetFocusWindow();
if (window_id<=0) if (window_id <= 0) {
{ didata = (SDL_DisplayData *) cursor->mouse->driverdata;
didata=(SDL_DisplayData*)cursor->mouse->driverdata; if (didata == NULL) {
if (didata==NULL) return;
{ }
return; } else {
} /* Sanity checks */
} window = SDL_GetWindowFromID(window_id);
else if (window != NULL) {
{ display = SDL_GetDisplayFromWindow(window);
/* Sanity checks */ if (display != NULL) {
window=SDL_GetWindowFromID(window_id); didata = (SDL_DisplayData *) display->driverdata;
if (window!=NULL) if (didata == NULL) {
{ return;
display=SDL_GetDisplayFromWindow(window); }
if (display!=NULL) } else {
{ return;
didata=(SDL_DisplayData*)display->driverdata;
if (didata==NULL)
{
return;
} }
} } else {
else return;
{ }
}
/* Add checks for out of screen bounds position */
if (cursor->mouse->x < 0) {
cursor->mouse->x = 0;
}
if (cursor->mouse->y < 0) {
cursor->mouse->y = 0;
}
/* Get window size to clamp maximum coordinates */
SDL_GetWindowSize(window_id, &xmax, &ymax);
if (cursor->mouse->x >= xmax) {
cursor->mouse->x = xmax - 1;
}
if (cursor->mouse->y >= ymax) {
cursor->mouse->y = ymax - 1;
}
status =
gf_cursor_set_pos(didata->display, 0, cursor->mouse->x,
cursor->mouse->y);
if (status != GF_ERR_OK) {
if (status != GF_ERR_NOSUPPORT) {
SDL_SetError("GF: Can't set hardware cursor position");
return; return;
} }
} }
else
{
return;
}
}
/* Add checks for out of screen bounds position */
if (cursor->mouse->x<0)
{
cursor->mouse->x=0;
}
if (cursor->mouse->y<0)
{
cursor->mouse->y=0;
}
/* Get window size to clamp maximum coordinates */
SDL_GetWindowSize(window_id, &xmax, &ymax);
if (cursor->mouse->x>=xmax)
{
cursor->mouse->x=xmax-1;
}
if (cursor->mouse->y>=ymax)
{
cursor->mouse->y=ymax-1;
}
status=gf_cursor_set_pos(didata->display, 0, cursor->mouse->x, cursor->mouse->y);
if (status!=GF_ERR_OK)
{
if (status!=GF_ERR_NOSUPPORT)
{
SDL_SetError("GF: Can't set hardware cursor position");
return;
}
}
} }
void gf_freecursor(SDL_Cursor* cursor) void
gf_freecursor(SDL_Cursor * cursor)
{ {
gf_cursor_t* internal_cursor; gf_cursor_t *internal_cursor;
if (cursor!=NULL) if (cursor != NULL) {
{ internal_cursor = (gf_cursor_t *) cursor->driverdata;
internal_cursor=(gf_cursor_t*)cursor->driverdata; if (internal_cursor != NULL) {
if (internal_cursor!=NULL) if (internal_cursor->cursor.bitmap.image0 != NULL) {
{ SDL_free((uint8_t *) internal_cursor->cursor.bitmap.image0);
if (internal_cursor->cursor.bitmap.image0!=NULL) }
{ if (internal_cursor->cursor.bitmap.image1 != NULL) {
SDL_free((uint8_t*)internal_cursor->cursor.bitmap.image0); SDL_free((uint8_t *) internal_cursor->cursor.bitmap.image1);
} }
if (internal_cursor->cursor.bitmap.image1!=NULL) SDL_free(internal_cursor);
{ }
SDL_free((uint8_t*)internal_cursor->cursor.bitmap.image1); }
}
SDL_free(internal_cursor);
}
}
} }
void gf_warpmouse(SDL_Mouse* mouse, SDL_WindowID windowID, int x, int y) void
gf_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y)
{ {
SDL_VideoDisplay* display; SDL_VideoDisplay *display;
SDL_DisplayData* didata; SDL_DisplayData *didata;
SDL_Window* window; SDL_Window *window;
uint32_t xmax; uint32_t xmax;
uint32_t ymax; uint32_t ymax;
int32_t status; int32_t status;
/* Sanity checks */ /* Sanity checks */
window=SDL_GetWindowFromID(windowID); window = SDL_GetWindowFromID(windowID);
if (window!=NULL) if (window != NULL) {
{ display = SDL_GetDisplayFromWindow(window);
display=SDL_GetDisplayFromWindow(window); if (display != NULL) {
if (display!=NULL) didata = (SDL_DisplayData *) display->driverdata;
{ if (didata == NULL) {
didata=(SDL_DisplayData*)display->driverdata; return;
if (didata==NULL) }
{ } else {
return; return;
} }
} } else {
else return;
{ }
return;
} /* Add checks for out of screen bounds position */
} if (x < 0) {
else x = 0;
{ }
return; if (y < 0) {
} y = 0;
}
/* Add checks for out of screen bounds position */
if (x<0) /* Get window size to clamp maximum coordinates */
{ SDL_GetWindowSize(windowID, &xmax, &ymax);
x=0; if (x >= xmax) {
} x = xmax - 1;
if (y<0) }
{ if (y >= ymax) {
y=0; y = ymax - 1;
} }
/* Get window size to clamp maximum coordinates */ status = gf_cursor_set_pos(didata->display, 0, x, y);
SDL_GetWindowSize(windowID, &xmax, &ymax); if (status != GF_ERR_OK) {
if (x>=xmax) if (status != GF_ERR_NOSUPPORT) {
{ SDL_SetError("GF: Can't set hardware cursor position");
x=xmax-1; return;
} }
if (y>=ymax) }
{
y=ymax-1;
}
status=gf_cursor_set_pos(didata->display, 0, x, y);
if (status!=GF_ERR_OK)
{
if (status!=GF_ERR_NOSUPPORT)
{
SDL_SetError("GF: Can't set hardware cursor position");
return;
}
}
} }
void gf_freemouse(SDL_Mouse* mouse) void
gf_freemouse(SDL_Mouse * mouse)
{ {
if (mouse->driverdata==NULL) if (mouse->driverdata == NULL) {
{ return;
return; }
}
/* Mouse framework doesn't deletes automatically our driverdata */ /* Mouse framework doesn't deletes automatically our driverdata */
SDL_free(mouse->driverdata); SDL_free(mouse->driverdata);
mouse->driverdata=NULL; mouse->driverdata = NULL;
return; return;
} }
/*****************************************************************************/ /*****************************************************************************/
...@@ -577,619 +529,610 @@ void gf_freemouse(SDL_Mouse* mouse) ...@@ -577,619 +529,610 @@ void gf_freemouse(SDL_Mouse* mouse)
/*****************************************************************************/ /*****************************************************************************/
static key_packet key_last_state[SDL_HIDDI_MAX_DEVICES]; static key_packet key_last_state[SDL_HIDDI_MAX_DEVICES];
static void hiddi_keyboard_handler(uint32_t devno, uint8_t* report_data, uint32_t report_len) static void
hiddi_keyboard_handler(uint32_t devno, uint8_t * report_data,
uint32_t report_len)
{ {
key_packet* packet; key_packet *packet;
uint32_t it; uint32_t it;
uint32_t jt; uint32_t jt;
packet=(key_packet*)report_data; packet = (key_packet *) report_data;
/* Check for special states */ /* Check for special states */
switch (report_len) switch (report_len) {
{ case 8: /* 8 bytes of report length */
case 8: /* 8 bytes of report length */ {
{ for (it = 0; it < 6; it++) {
for (it=0; it<6; it++) /* Check for keyboard overflow, when it can't handle */
{ /* many simultaneous pressed keys */
/* Check for keyboard overflow, when it can't handle */ if (packet->codes[it] == HIDDI_KEY_OVERFLOW) {
/* many simultaneous pressed keys */
if (packet->codes[it]==HIDDI_KEY_OVERFLOW)
{
return; return;
} }
} }
} }
break; break;
default: default:
{ {
/* Do not process unknown reports */ /* Do not process unknown reports */
return; return;
} }
break; break;
} }
/* Check if modifier key was pressed */ /* Check if modifier key was pressed */
if (packet->modifiers!=key_last_state[devno].modifiers) if (packet->modifiers != key_last_state[devno].modifiers) {
{ if (((packet->modifiers & HIDDI_MKEY_LEFT_CTRL) ==
if (((packet->modifiers & HIDDI_MKEY_LEFT_CTRL)==HIDDI_MKEY_LEFT_CTRL) && HIDDI_MKEY_LEFT_CTRL)
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_CTRL)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_CTRL) == 0) {
{ /* Left Ctrl key was pressed */
/* Left Ctrl key was pressed */ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LCTRL);
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LCTRL); }
} if (((packet->modifiers & HIDDI_MKEY_LEFT_CTRL) == 0) &&
if (((packet->modifiers & HIDDI_MKEY_LEFT_CTRL)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_CTRL) ==
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_CTRL)==HIDDI_MKEY_LEFT_CTRL) HIDDI_MKEY_LEFT_CTRL) {
{ /* Left Ctrl key was released */
/* Left Ctrl key was released */ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LCTRL);
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LCTRL); }
} if (((packet->modifiers & HIDDI_MKEY_LEFT_SHIFT) ==
if (((packet->modifiers & HIDDI_MKEY_LEFT_SHIFT)==HIDDI_MKEY_LEFT_SHIFT) && HIDDI_MKEY_LEFT_SHIFT)
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_SHIFT)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_SHIFT) == 0) {
{ /* Left Shift key was pressed */
/* Left Shift key was pressed */ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LSHIFT);
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LSHIFT); }
} if (((packet->modifiers & HIDDI_MKEY_LEFT_SHIFT) == 0) &&
if (((packet->modifiers & HIDDI_MKEY_LEFT_SHIFT)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_SHIFT) ==
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_SHIFT)==HIDDI_MKEY_LEFT_SHIFT) HIDDI_MKEY_LEFT_SHIFT) {
{ /* Left Shift key was released */
/* Left Shift key was released */ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LSHIFT);
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LSHIFT); }
} if (((packet->modifiers & HIDDI_MKEY_LEFT_ALT) == HIDDI_MKEY_LEFT_ALT)
if (((packet->modifiers & HIDDI_MKEY_LEFT_ALT)==HIDDI_MKEY_LEFT_ALT) && && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_ALT) == 0) {
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_ALT)==0) /* Left Alt key was pressed */
{ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LALT);
/* Left Alt key was pressed */ }
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LALT); if (((packet->modifiers & HIDDI_MKEY_LEFT_ALT) == 0) &&
} (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_ALT) ==
if (((packet->modifiers & HIDDI_MKEY_LEFT_ALT)==0) && HIDDI_MKEY_LEFT_ALT) {
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_ALT)==HIDDI_MKEY_LEFT_ALT) /* Left Alt key was released */
{ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LALT);
/* Left Alt key was released */ }
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LALT); if (((packet->modifiers & HIDDI_MKEY_LEFT_WFLAG) ==
} HIDDI_MKEY_LEFT_WFLAG)
if (((packet->modifiers & HIDDI_MKEY_LEFT_WFLAG)==HIDDI_MKEY_LEFT_WFLAG) && && (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_WFLAG) == 0) {
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_WFLAG)==0) /* Left Windows flag key was pressed */
{ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LGUI);
/* Left Windows flag key was pressed */ }
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_LGUI); if (((packet->modifiers & HIDDI_MKEY_LEFT_WFLAG) == 0) &&
} (key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_WFLAG) ==
if (((packet->modifiers & HIDDI_MKEY_LEFT_WFLAG)==0) && HIDDI_MKEY_LEFT_WFLAG) {
(key_last_state[devno].modifiers & HIDDI_MKEY_LEFT_WFLAG)==HIDDI_MKEY_LEFT_WFLAG) /* Left Windows flag key was released */
{ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LGUI);
/* Left Windows flag key was released */ }
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_LGUI); if (((packet->modifiers & HIDDI_MKEY_RIGHT_CTRL) ==
} HIDDI_MKEY_RIGHT_CTRL)
if (((packet->modifiers & HIDDI_MKEY_RIGHT_CTRL)==HIDDI_MKEY_RIGHT_CTRL) && && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_CTRL) == 0) {
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_CTRL)==0) /* Right Ctrl key was pressed */
{ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RCTRL);
/* Right Ctrl key was pressed */ }
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RCTRL); if (((packet->modifiers & HIDDI_MKEY_RIGHT_CTRL) == 0) &&
} (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_CTRL) ==
if (((packet->modifiers & HIDDI_MKEY_RIGHT_CTRL)==0) && HIDDI_MKEY_RIGHT_CTRL) {
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_CTRL)==HIDDI_MKEY_RIGHT_CTRL) /* Right Ctrl key was released */
{ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RCTRL);
/* Right Ctrl key was released */ }
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RCTRL); if (((packet->modifiers & HIDDI_MKEY_RIGHT_SHIFT) ==
} HIDDI_MKEY_RIGHT_SHIFT)
if (((packet->modifiers & HIDDI_MKEY_RIGHT_SHIFT)==HIDDI_MKEY_RIGHT_SHIFT) && && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_SHIFT) ==
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_SHIFT)==0) 0) {
{ /* Right Shift key was pressed */
/* Right Shift key was pressed */ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RSHIFT);
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RSHIFT); }
} if (((packet->modifiers & HIDDI_MKEY_RIGHT_SHIFT) == 0) &&
if (((packet->modifiers & HIDDI_MKEY_RIGHT_SHIFT)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_SHIFT) ==
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_SHIFT)==HIDDI_MKEY_RIGHT_SHIFT) HIDDI_MKEY_RIGHT_SHIFT) {
{ /* Right Shift key was released */
/* Right Shift key was released */ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RSHIFT);
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RSHIFT); }
} if (((packet->modifiers & HIDDI_MKEY_RIGHT_ALT) ==
if (((packet->modifiers & HIDDI_MKEY_RIGHT_ALT)==HIDDI_MKEY_RIGHT_ALT) && HIDDI_MKEY_RIGHT_ALT)
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_ALT)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_ALT) == 0) {
{ /* Right Alt key was pressed */
/* Right Alt key was pressed */ SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RALT);
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RALT); }
} if (((packet->modifiers & HIDDI_MKEY_RIGHT_ALT) == 0) &&
if (((packet->modifiers & HIDDI_MKEY_RIGHT_ALT)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_ALT) ==
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_ALT)==HIDDI_MKEY_RIGHT_ALT) HIDDI_MKEY_RIGHT_ALT) {
{ /* Right Alt key was released */
/* Right Alt key was released */ SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RALT);
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RALT); }
} if (((packet->modifiers & HIDDI_MKEY_RIGHT_WFLAG) ==
if (((packet->modifiers & HIDDI_MKEY_RIGHT_WFLAG)==HIDDI_MKEY_RIGHT_WFLAG) && HIDDI_MKEY_RIGHT_WFLAG)
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_WFLAG)==0) && (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_WFLAG) ==
{ 0) {
/* Right Windows flag key was pressed */ /* Right Windows flag key was pressed */
SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RGUI); SDL_SendKeyboardKey(0, SDL_PRESSED, SDL_SCANCODE_RGUI);
} }
if (((packet->modifiers & HIDDI_MKEY_RIGHT_WFLAG)==0) && if (((packet->modifiers & HIDDI_MKEY_RIGHT_WFLAG) == 0) &&
(key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_WFLAG)==HIDDI_MKEY_RIGHT_WFLAG) (key_last_state[devno].modifiers & HIDDI_MKEY_RIGHT_WFLAG) ==
{ HIDDI_MKEY_RIGHT_WFLAG) {
/* Right Windows flag key was released */ /* Right Windows flag key was released */
SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RGUI); SDL_SendKeyboardKey(0, SDL_RELEASED, SDL_SCANCODE_RGUI);
} }
} }
/* Check each key in the press/release buffer */ /* Check each key in the press/release buffer */
switch (report_len) switch (report_len) {
{ case 8: /* 8 bytes of report length */
case 8: /* 8 bytes of report length */ {
{ /* Check if at least one key was unpressed */
/* Check if at least one key was unpressed */ for (it = 0; it < 6; it++) {
for (it=0; it<6; it++) if (key_last_state[devno].codes[it] == HIDDI_KEY_UNPRESSED) {
{
if (key_last_state[devno].codes[it]==HIDDI_KEY_UNPRESSED)
{
/* if stored keycode is zero, find another */ /* if stored keycode is zero, find another */
continue; continue;
} }
for (jt=0; jt<6; jt++) for (jt = 0; jt < 6; jt++) {
{
/* Find stored keycode in the current pressed codes */ /* Find stored keycode in the current pressed codes */
if (packet->codes[jt]==key_last_state[devno].codes[it]) if (packet->codes[jt] == key_last_state[devno].codes[it]) {
{ /* If found then particular key state is not changed */
/* If found then particular key state is not changed */ break;
break;
} }
} }
/* Check if pressed key can't longer be found */ /* Check if pressed key can't longer be found */
if (jt==6) if (jt == 6) {
{ SDL_SendKeyboardKey(0, SDL_RELEASED,
SDL_SendKeyboardKey(0, SDL_RELEASED, key_last_state[devno].codes[it]); key_last_state[devno].codes[it]);
} }
} }
/* Check if at least one new key was pressed */ /* Check if at least one new key was pressed */
for (it=0; it<6; it++) for (it = 0; it < 6; it++) {
{ if (packet->codes[it] == HIDDI_KEY_UNPRESSED) {
if (packet->codes[it]==HIDDI_KEY_UNPRESSED)
{
continue; continue;
} }
for (jt=0; jt<6; jt++) for (jt = 0; jt < 6; jt++) {
{
/* Find new keycode it the array of old pressed keys */ /* Find new keycode it the array of old pressed keys */
if (packet->codes[it]==key_last_state[devno].codes[jt]) if (packet->codes[it] == key_last_state[devno].codes[jt]) {
{ break;
break;
} }
} }
/* Check if new key was pressed */ /* Check if new key was pressed */
if (jt==6) if (jt == 6) {
{
SDL_SendKeyboardKey(0, SDL_PRESSED, packet->codes[it]); SDL_SendKeyboardKey(0, SDL_PRESSED, packet->codes[it]);
} }
} }
} }
default: /* unknown keyboard report type */ default: /* unknown keyboard report type */
{ {
/* Ignore all unknown reports */ /* Ignore all unknown reports */
} }
break; break;
} }
/* Store last state */ /* Store last state */
key_last_state[devno]=*packet; key_last_state[devno] = *packet;
} }
static uint32_t mouse_last_state_button[SDL_HIDDI_MAX_DEVICES]; static uint32_t mouse_last_state_button[SDL_HIDDI_MAX_DEVICES];
static uint32_t collect_reports=0; static uint32_t collect_reports = 0;
static void hiddi_mouse_handler(uint32_t devno, uint8_t* report_data, uint32_t report_len) static void
hiddi_mouse_handler(uint32_t devno, uint8_t * report_data,
uint32_t report_len)
{ {
uint32_t it; uint32_t it;
uint32_t sdlbutton; uint32_t sdlbutton;
/* We do not want to collect stored events */ /* We do not want to collect stored events */
if (collect_reports==0) if (collect_reports == 0) {
{ return;
return; }
}
/* Check for special states */
/* Check for special states */ switch (report_len) {
switch (report_len) case 8: /* 8 bytes of report length, usually multi-button USB mice */
{ {
case 8: /* 8 bytes of report length, usually multi-button USB mice */ mouse_packet8 *packet;
{ packet = (mouse_packet8 *) report_data;
mouse_packet8* packet;
packet=(mouse_packet8*)report_data; /* Send motion event if motion really was */
if ((packet->horizontal_precision != 0)
/* Send motion event if motion really was */ || (packet->vertical_precision != 0)) {
if ((packet->horizontal_precision!=0) || (packet->vertical_precision!=0)) SDL_SendMouseMotion(0, 1, packet->horizontal_precision,
{ packet->vertical_precision, 0);
SDL_SendMouseMotion(0, 1, packet->horizontal_precision, packet->vertical_precision, 0); }
}
/* Send mouse button press/release events */
/* Send mouse button press/release events */ if (mouse_last_state_button[devno] != packet->buttons) {
if (mouse_last_state_button[devno]!=packet->buttons) /* Cycle all buttons status */
{ for (it = 0; it < 8; it++) {
/* Cycle all buttons status */
for (it=0; it<8; it++)
{
/* convert hiddi button id to sdl button id */ /* convert hiddi button id to sdl button id */
switch(it) switch (it) {
{ case 0:
case 0: {
{ sdlbutton = SDL_BUTTON_LEFT;
sdlbutton=SDL_BUTTON_LEFT; }
} break;
break; case 1:
case 1: {
{ sdlbutton = SDL_BUTTON_RIGHT;
sdlbutton=SDL_BUTTON_RIGHT; }
} break;
break; case 2:
case 2: {
{ sdlbutton = SDL_BUTTON_MIDDLE;
sdlbutton=SDL_BUTTON_MIDDLE; }
} break;
break; default:
default: {
{ sdlbutton = it + 1;
sdlbutton=it+1; }
} break;
break;
} }
/* Button pressed */ /* Button pressed */
if (((packet->buttons & (0x01<<it))==(0x01<<it)) && if (((packet->buttons & (0x01 << it)) == (0x01 << it)) &&
((mouse_last_state_button[devno] & (0x01<<it))==0x00)) ((mouse_last_state_button[devno] & (0x01 << it)) ==
{ 0x00)) {
SDL_SendMouseButton(0, SDL_PRESSED, sdlbutton); SDL_SendMouseButton(0, SDL_PRESSED, sdlbutton);
} }
/* Button released */ /* Button released */
if (((packet->buttons & (0x01<<it))==0x00) && if (((packet->buttons & (0x01 << it)) == 0x00) &&
((mouse_last_state_button[devno] & (0x01<<it))==(0x01<<it))) ((mouse_last_state_button[devno] & (0x01 << it)) ==
{ (0x01 << it))) {
SDL_SendMouseButton(0, SDL_RELEASED, sdlbutton); SDL_SendMouseButton(0, SDL_RELEASED, sdlbutton);
} }
} }
mouse_last_state_button[devno]=packet->buttons; mouse_last_state_button[devno] = packet->buttons;
} }
/* Send mouse wheel events */ /* Send mouse wheel events */
if (packet->wheel!=0) if (packet->wheel != 0) {
{ /* Send vertical wheel event only */
/* Send vertical wheel event only */ SDL_SendMouseWheel(0, 0, packet->wheel);
SDL_SendMouseWheel(0, 0, packet->wheel); }
} }
} break;
break; case 4: /* 4 bytes of report length, usually PS/2 mice */
case 4: /* 4 bytes of report length, usually PS/2 mice */ {
{ mouse_packet4 *packet;
mouse_packet4* packet; packet = (mouse_packet4 *) report_data;
packet=(mouse_packet4*)report_data;
/* Send motion event if motion really was */
/* Send motion event if motion really was */ if ((packet->horizontal != 0) || (packet->vertical != 0)) {
if ((packet->horizontal!=0) || (packet->vertical!=0)) SDL_SendMouseMotion(0, 1, packet->horizontal,
{ packet->vertical, 0);
SDL_SendMouseMotion(0, 1, packet->horizontal, packet->vertical, 0); }
}
/* Send mouse button press/release events */
/* Send mouse button press/release events */ if (mouse_last_state_button[devno] != packet->buttons) {
if (mouse_last_state_button[devno]!=packet->buttons) /* Cycle all buttons status */
{ for (it = 0; it < 8; it++) {
/* Cycle all buttons status */
for (it=0; it<8; it++)
{
/* convert hiddi button id to sdl button id */ /* convert hiddi button id to sdl button id */
switch(it) switch (it) {
{ case 0:
case 0: {
{ sdlbutton = SDL_BUTTON_LEFT;
sdlbutton=SDL_BUTTON_LEFT; }
} break;
break; case 1:
case 1: {
{ sdlbutton = SDL_BUTTON_RIGHT;
sdlbutton=SDL_BUTTON_RIGHT; }
} break;
break; case 2:
case 2: {
{ sdlbutton = SDL_BUTTON_MIDDLE;
sdlbutton=SDL_BUTTON_MIDDLE; }
} break;
break; default:
default: {
{ sdlbutton = it + 1;
sdlbutton=it+1; }
} break;
break;
} }
/* Button pressed */ /* Button pressed */
if (((packet->buttons & (0x01<<it))==(0x01<<it)) && if (((packet->buttons & (0x01 << it)) == (0x01 << it)) &&
((mouse_last_state_button[devno] & (0x01<<it))==0x00)) ((mouse_last_state_button[devno] & (0x01 << it)) ==
{ 0x00)) {
SDL_SendMouseButton(0, SDL_PRESSED, sdlbutton); SDL_SendMouseButton(0, SDL_PRESSED, sdlbutton);
} }
/* Button released */ /* Button released */
if (((packet->buttons & (0x01<<it))==0x00) && if (((packet->buttons & (0x01 << it)) == 0x00) &&
((mouse_last_state_button[devno] & (0x01<<it))==(0x01<<it))) ((mouse_last_state_button[devno] & (0x01 << it)) ==
{ (0x01 << it))) {
SDL_SendMouseButton(0, SDL_RELEASED, sdlbutton); SDL_SendMouseButton(0, SDL_RELEASED, sdlbutton);
} }
} }
mouse_last_state_button[devno]=packet->buttons; mouse_last_state_button[devno] = packet->buttons;
} }
/* Send mouse wheel events */ /* Send mouse wheel events */
if (packet->wheel!=0) if (packet->wheel != 0) {
{ /* Send vertical wheel event only */
/* Send vertical wheel event only */ SDL_SendMouseWheel(0, 0, packet->wheel);
SDL_SendMouseWheel(0, 0, packet->wheel); }
} }
} break;
break; }
}
} }
/*****************************************************************************/ /*****************************************************************************/
/* HIDDI interacting code */ /* HIDDI interacting code */
/*****************************************************************************/ /*****************************************************************************/
static hidd_device_ident_t hiddevice= static hidd_device_ident_t hiddevice = {
{ HIDD_CONNECT_WILDCARD, /* vendor id: any */
HIDD_CONNECT_WILDCARD, /* vendor id: any */ HIDD_CONNECT_WILDCARD, /* product id: any */
HIDD_CONNECT_WILDCARD, /* product id: any */ HIDD_CONNECT_WILDCARD, /* version: any */
HIDD_CONNECT_WILDCARD, /* version: any */
}; };
static hidd_connect_parm_t hidparams={NULL, HID_VERSION, HIDD_VERSION, 0, 0, &hiddevice, NULL, 0}; static hidd_connect_parm_t hidparams =
{ NULL, HID_VERSION, HIDD_VERSION, 0, 0, &hiddevice, NULL, 0 };
static void hiddi_insertion(struct hidd_connection* connection, hidd_device_instance_t* device_instance); static void hiddi_insertion(struct hidd_connection *connection,
static void hiddi_removal(struct hidd_connection* connection, hidd_device_instance_t* instance); hidd_device_instance_t * device_instance);
static void hiddi_report(struct hidd_connection* connection, struct hidd_report* report, void* report_data, uint32_t report_len, uint32_t flags, void* user); static void hiddi_removal(struct hidd_connection *connection,
hidd_device_instance_t * instance);
static void hiddi_report(struct hidd_connection *connection,
struct hidd_report *report, void *report_data,
uint32_t report_len, uint32_t flags, void *user);
static hidd_funcs_t hidfuncs={_HIDDI_NFUNCS, hiddi_insertion, hiddi_removal, hiddi_report, NULL}; static hidd_funcs_t hidfuncs =
{ _HIDDI_NFUNCS, hiddi_insertion, hiddi_removal, hiddi_report, NULL };
/* HID handle, singletone */ /* HID handle, singletone */
struct hidd_connection* connection=NULL; struct hidd_connection *connection = NULL;
/* SDL detected input device types, singletone */ /* SDL detected input device types, singletone */
static uint32_t sdl_input_devices[SDL_HIDDI_MAX_DEVICES]; static uint32_t sdl_input_devices[SDL_HIDDI_MAX_DEVICES];
static int hiddi_register_for_reports(struct hidd_collection* col, hidd_device_instance_t* device_instance) static int
hiddi_register_for_reports(struct hidd_collection *col,
hidd_device_instance_t * device_instance)
{ {
int it; int it;
uint16_t num_col; uint16_t num_col;
struct hidd_collection** hidd_collections; struct hidd_collection **hidd_collections;
struct hidd_report_instance* report_instance; struct hidd_report_instance *report_instance;
struct hidd_report* report; struct hidd_report *report;
int status=0; int status = 0;
hidview_device_t* device; hidview_device_t *device;
for (it=0 ; it<10 && !status; it++) for (it = 0; it < 10 && !status; it++) {
{ status =
status=hidd_get_report_instance(col, it, HID_INPUT_REPORT, &report_instance); hidd_get_report_instance(col, it, HID_INPUT_REPORT,
if (status==EOK) &report_instance);
{ if (status == EOK) {
status=hidd_report_attach(connection, device_instance, report_instance, 0, sizeof(hidview_device_t), &report); status =
if (status==EOK) hidd_report_attach(connection, device_instance,
{ report_instance, 0,
device=hidd_report_extra(report); sizeof(hidview_device_t), &report);
device->report=report; if (status == EOK) {
device->instance=report_instance; device = hidd_report_extra(report);
} device->report = report;
} device->instance = report_instance;
} }
hidd_get_collections(NULL, col, &hidd_collections, &num_col); }
}
for (it=0; it<num_col; it++) hidd_get_collections(NULL, col, &hidd_collections, &num_col);
{
hiddi_register_for_reports(hidd_collections[it], device_instance); for (it = 0; it < num_col; it++) {
} hiddi_register_for_reports(hidd_collections[it], device_instance);
}
return EOK;
return EOK;
} }
static void hiddi_insertion(struct hidd_connection* connection, hidd_device_instance_t* device_instance) static void
hiddi_insertion(struct hidd_connection *connection,
hidd_device_instance_t * device_instance)
{ {
uint32_t it; uint32_t it;
struct hidd_collection** hidd_collections; struct hidd_collection **hidd_collections;
uint16_t num_col; uint16_t num_col;
/* get root level collections */ /* get root level collections */
hidd_get_collections(device_instance, NULL, &hidd_collections, &num_col); hidd_get_collections(device_instance, NULL, &hidd_collections, &num_col);
for (it=0; it<num_col; it++) for (it = 0; it < num_col; it++) {
{ hiddi_register_for_reports(hidd_collections[it], device_instance);
hiddi_register_for_reports(hidd_collections[it], device_instance); }
}
} }
static void hiddi_removal(struct hidd_connection* connection, hidd_device_instance_t* instance) static void
hiddi_removal(struct hidd_connection *connection,
hidd_device_instance_t * instance)
{ {
hidd_reports_detach(connection, instance); hidd_reports_detach(connection, instance);
} }
static void hiddi_report(struct hidd_connection* connection, hidd_report_t* report, void* report_data, uint32_t report_len, uint32_t flags, void* user) static void
hiddi_report(struct hidd_connection *connection, hidd_report_t * report,
void *report_data, uint32_t report_len, uint32_t flags,
void *user)
{ {
if (report->dev_inst->devno>=SDL_HIDDI_MAX_DEVICES) if (report->dev_inst->devno >= SDL_HIDDI_MAX_DEVICES) {
{ /* Unknown HID device, with devno number out of supported range */
/* Unknown HID device, with devno number out of supported range */ return;
return; }
}
/* Check device type which generates event */
/* Check device type which generates event */ switch (sdl_input_devices[report->dev_inst->devno]) {
switch (sdl_input_devices[report->dev_inst->devno]) case SDL_GF_HIDDI_NONE:
{ {
case SDL_GF_HIDDI_NONE: /* We do not handle other devices type */
{ return;
/* We do not handle other devices type*/ }
return; break;
} case SDL_GF_HIDDI_MOUSE:
break; {
case SDL_GF_HIDDI_MOUSE: /* Call mouse handler */
{ hiddi_mouse_handler(report->dev_inst->devno, report_data,
/* Call mouse handler */ report_len);
hiddi_mouse_handler(report->dev_inst->devno, report_data, report_len); }
} break;
break; case SDL_GF_HIDDI_KEYBOARD:
case SDL_GF_HIDDI_KEYBOARD: {
{ /* Call keyboard handler */
/* Call keyboard handler */ hiddi_keyboard_handler(report->dev_inst->devno, report_data,
hiddi_keyboard_handler(report->dev_inst->devno, report_data, report_len); report_len);
} }
break; break;
case SDL_GF_HIDDI_JOYSTICK: case SDL_GF_HIDDI_JOYSTICK:
{ {
/* Call joystick handler */ /* Call joystick handler */
} }
break; break;
} }
} }
static hiddi_get_device_type(uint8_t* report_data, uint16_t report_length) static
hiddi_get_device_type(uint8_t * report_data, uint16_t report_length)
{ {
hid_byte_t byte; hid_byte_t byte;
uint16_t usage_page=0; uint16_t usage_page = 0;
uint16_t usage=0; uint16_t usage = 0;
uint16_t data=0; uint16_t data = 0;
while (report_length && !(usage_page && usage)) while (report_length && !(usage_page && usage)) {
{ if (hidp_analyse_byte(*report_data, &byte)) {
if (hidp_analyse_byte(*report_data, &byte)) /* Error in parser, do nothing */
{ }
/* Error in parser, do nothing */ data = hidp_get_data((report_data + 1), &byte);
} switch (byte.HIDB_Type) {
data=hidp_get_data((report_data+1), &byte); case HID_TYPE_GLOBAL:
switch (byte.HIDB_Type) if (!usage_page && byte.HIDB_Tag == HID_GLOBAL_USAGE_PAGE) {
{ usage_page = data;
case HID_TYPE_GLOBAL: }
if (!usage_page && byte.HIDB_Tag==HID_GLOBAL_USAGE_PAGE) break;
{ case HID_TYPE_LOCAL:
usage_page=data; if (!usage && byte.HIDB_Tag == HID_LOCAL_USAGE) {
} usage = data;
break; }
case HID_TYPE_LOCAL: break;
if (!usage && byte.HIDB_Tag==HID_LOCAL_USAGE) }
{ report_data += byte.HIDB_Length + 1;
usage=data; report_length -= byte.HIDB_Length + 1;
} }
break;
} switch (usage_page) {
report_data+=byte.HIDB_Length+1; case HIDD_PAGE_DESKTOP:
report_length-=byte.HIDB_Length+1; {
} switch (usage) {
case HIDD_USAGE_MOUSE:
switch (usage_page) {
{ return SDL_GF_HIDDI_MOUSE;
case HIDD_PAGE_DESKTOP: }
{ break;
switch (usage) case HIDD_USAGE_JOYSTICK:
{ {
case HIDD_USAGE_MOUSE: return SDL_GF_HIDDI_JOYSTICK;
{ }
return SDL_GF_HIDDI_MOUSE; break;
} case HIDD_USAGE_KEYBOARD:
break; {
case HIDD_USAGE_JOYSTICK: return SDL_GF_HIDDI_KEYBOARD;
{ }
return SDL_GF_HIDDI_JOYSTICK; break;
} }
break; }
case HIDD_USAGE_KEYBOARD: break;
{ case HIDD_PAGE_DIGITIZER:
return SDL_GF_HIDDI_KEYBOARD; {
} /* Do not handle digitizers */
break; }
} break;
} case HIDD_PAGE_CONSUMER:
break; {
case HIDD_PAGE_DIGITIZER: /* Do not handle consumer input devices */
{ }
/* Do not handle digitizers */ break;
} }
break;
case HIDD_PAGE_CONSUMER: return SDL_GF_HIDDI_NONE;
{
/* Do not handle consumer input devices */
}
break;
}
return SDL_GF_HIDDI_NONE;
} }
static int32_t hiddi_connect_devices() static int32_t
hiddi_connect_devices()
{ {
int32_t status; int32_t status;
uint32_t it; uint32_t it;
uint8_t* report_data; uint8_t *report_data;
uint16_t report_length; uint16_t report_length;
hidd_device_instance_t instance; hidd_device_instance_t instance;
/* Cleanup initial keys and mice state */ /* Cleanup initial keys and mice state */
SDL_memset(key_last_state, 0x00, sizeof(key_packet)*SDL_HIDDI_MAX_DEVICES); SDL_memset(key_last_state, 0x00,
SDL_memset(mouse_last_state_button, 0x00, sizeof(uint32_t)*SDL_HIDDI_MAX_DEVICES); sizeof(key_packet) * SDL_HIDDI_MAX_DEVICES);
SDL_memset(mouse_last_state_button, 0x00,
status=hidd_connect(&hidparams, &connection); sizeof(uint32_t) * SDL_HIDDI_MAX_DEVICES);
if (status!=EOK)
{ status = hidd_connect(&hidparams, &connection);
return -1; if (status != EOK) {
} return -1;
}
for (it=0; it<SDL_HIDDI_MAX_DEVICES; it++)
{ for (it = 0; it < SDL_HIDDI_MAX_DEVICES; it++) {
/* Get device instance */ /* Get device instance */
status=hidd_get_device_instance(connection, it, &instance); status = hidd_get_device_instance(connection, it, &instance);
if (status!=EOK) if (status != EOK) {
{ continue;
continue; }
}
status =
status=hidd_get_report_desc(connection, &instance, &report_data, &report_length); hidd_get_report_desc(connection, &instance, &report_data,
if (status!=EOK) &report_length);
{ if (status != EOK) {
continue; continue;
} }
status=hiddi_get_device_type(report_data, report_length); status = hiddi_get_device_type(report_data, report_length);
sdl_input_devices[it]=status; sdl_input_devices[it] = status;
free(report_data); free(report_data);
} }
/* Disconnect from HID server */ /* Disconnect from HID server */
status=hidd_disconnect(connection); status = hidd_disconnect(connection);
if (status!=EOK) if (status != EOK) {
{ return -1;
return -1; }
}
/* Add handlers for HID devices */
/* Add handlers for HID devices */ hidparams.funcs = &hidfuncs;
hidparams.funcs=&hidfuncs;
status = hidd_connect(&hidparams, &connection);
status=hidd_connect(&hidparams, &connection); if (status != EOK) {
if (status!=EOK) return -1;
{ }
return -1;
} return 0;
return 0;
} }
static int32_t hiddi_disconnect_devices() static int32_t
hiddi_disconnect_devices()
{ {
int32_t status; int32_t status;
hiddi_disable_mouse(); hiddi_disable_mouse();
/* Disconnect from HID server */ /* Disconnect from HID server */
status=hidd_disconnect(connection); status = hidd_disconnect(connection);
if (status!=EOK) if (status != EOK) {
{ return -1;
return -1; }
}
} }
void hiddi_enable_mouse() void
hiddi_enable_mouse()
{ {
collect_reports=1; collect_reports = 1;
} }
void hiddi_disable_mouse() void
hiddi_disable_mouse()
{ {
collect_reports=0; collect_reports = 0;
} }
src/video/qnxgf/SDL_gf_input.h
View file @ 483f2ba3
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
typedef struct SDL_MouseData typedef struct SDL_MouseData
{ {
SDL_DisplayData* didata; SDL_DisplayData *didata;
} SDL_MouseData; } SDL_MouseData;
int32_t gf_addinputdevices(_THIS); int32_t gf_addinputdevices(_THIS);
...@@ -65,85 +65,85 @@ int32_t gf_delinputdevices(_THIS); ...@@ -65,85 +65,85 @@ int32_t gf_delinputdevices(_THIS);
typedef struct _hid_byte typedef struct _hid_byte
{ {
uint8_t HIDB_Length; uint8_t HIDB_Length;
uint8_t HIDB_Type; uint8_t HIDB_Type;
uint8_t HIDB_Tag; uint8_t HIDB_Tag;
uint8_t reserved[1]; uint8_t reserved[1];
} hid_byte_t; } hid_byte_t;
typedef struct _hidd_global_item typedef struct _hidd_global_item
{ {
uint16_t usage_page; uint16_t usage_page;
uint16_t logical_min; uint16_t logical_min;
uint16_t logical_max; uint16_t logical_max;
uint16_t physical_min; uint16_t physical_min;
uint16_t physical_max; uint16_t physical_max;
uint16_t unit_expo; uint16_t unit_expo;
uint16_t unit; uint16_t unit;
uint16_t report_size; uint16_t report_size;
uint16_t report_id; uint16_t report_id;
uint16_t report_count; uint16_t report_count;
} hidd_global_item_t; } hidd_global_item_t;
typedef struct _hidd_local_item typedef struct _hidd_local_item
{ {
uint16_t type; uint16_t type;
uint8_t reserved[2]; uint8_t reserved[2];
uint32_t value; uint32_t value;
struct _hidd_local_item* next_local; struct _hidd_local_item *next_local;
struct _hidd_local_item* alt_local; struct _hidd_local_item *alt_local;
} hidd_local_item_t; } hidd_local_item_t;
typedef struct _hidd_local_table typedef struct _hidd_local_table
{ {
hidd_local_item_t* usage_info; hidd_local_item_t *usage_info;
hidd_local_item_t* designator_info; hidd_local_item_t *designator_info;
hidd_local_item_t* string_info; hidd_local_item_t *string_info;
uint8_t delimiter; uint8_t delimiter;
uint8_t reserved[3]; uint8_t reserved[3];
} hidd_local_table_t; } hidd_local_table_t;
typedef struct _hidd_field typedef struct _hidd_field
{ {
struct hidd_report_instance* report; struct hidd_report_instance *report;
struct hidd_collection* collection; struct hidd_collection *collection;
uint16_t report_offset; uint16_t report_offset;
uint16_t flags; uint16_t flags;
hidd_global_item_t gitem; hidd_global_item_t gitem;
hidd_local_table_t* ltable; hidd_local_table_t *ltable;
struct _hidd_field* next_field; struct _hidd_field *next_field;
void* user; void *user;
} hidd_field_t; } hidd_field_t;
typedef struct hidd_report_instance typedef struct hidd_report_instance
{ {
uint8_t report_id; uint8_t report_id;
uint8_t reserved[1]; uint8_t reserved[1];
uint16_t report_type; uint16_t report_type;
hidd_field_t* field; hidd_field_t *field;
uint16_t num_field; uint16_t num_field;
uint16_t byte_len; uint16_t byte_len;
uint16_t bit_len; uint16_t bit_len;
uint8_t reserved2[2]; uint8_t reserved2[2];
struct hidd_collection* collection; struct hidd_collection *collection;
struct hidd_report_instance* next_col_report; struct hidd_report_instance *next_col_report;
struct hidd_report_instance* next_report; struct hidd_report_instance *next_report;
} hidd_report_instance_t; } hidd_report_instance_t;
typedef struct hidd_report typedef struct hidd_report
{ {
TAILQ_ENTRY(hidd_report) link; TAILQ_ENTRY(hidd_report) link;
hidd_report_instance_t* rinst; hidd_report_instance_t *rinst;
hidd_device_instance_t* dev_inst; hidd_device_instance_t *dev_inst;
uint32_t flags; uint32_t flags;
struct hidd_connection* connection; struct hidd_connection *connection;
void* user; void *user;
} hidd_report_t; } hidd_report_t;
typedef struct hidview_device typedef struct hidview_device
{ {
struct hidd_report_instance* instance; struct hidd_report_instance *instance;
struct hidd_report* report; struct hidd_report *report;
} hidview_device_t; } hidview_device_t;
/*****************************************************************************/ /*****************************************************************************/
......
src/video/qnxgf/SDL_gf_opengles.c
View file @ 483f2ba3
...@@ -30,21 +30,25 @@ ...@@ -30,21 +30,25 @@
/* This is OpenGL ES 1.0 helper functions from OpenGL ES 1.1 specification, */ /* This is OpenGL ES 1.0 helper functions from OpenGL ES 1.1 specification, */
/* which could be implemented independently from hardware, just wrappers */ /* which could be implemented independently from hardware, just wrappers */
GLAPI void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param) GLAPI void APIENTRY
glTexParameteri(GLenum target, GLenum pname, GLint param)
{ {
glTexParameterx(target, pname, (GLfixed)param); glTexParameterx(target, pname, (GLfixed) param);
return; return;
} }
GLAPI void APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params) GLAPI void APIENTRY
glTexParameteriv(GLenum target, GLenum pname, const GLint * params)
{ {
/* Retrieve one parameter only */ /* Retrieve one parameter only */
glTexParameterx(target, pname, (GLfixed)*params); glTexParameterx(target, pname, (GLfixed) * params);
return; return;
} }
GLAPI void APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) GLAPI void APIENTRY
glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
{ {
glColor4f(((GLfloat)red)/255.f, ((GLfloat)green)/255.f, ((GLfloat)blue)/255.f, ((GLfloat)alpha)/255.f); glColor4f(((GLfloat) red) / 255.f, ((GLfloat) green) / 255.f,
return; ((GLfloat) blue) / 255.f, ((GLfloat) alpha) / 255.f);
return;
} }
src/video/qnxgf/SDL_gf_opengles.h
View file @ 483f2ba3
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#include <GLES/glext.h> #include <GLES/glext.h>
GLAPI void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param); GLAPI void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param);
GLAPI void APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params); GLAPI void APIENTRY glTexParameteriv(GLenum target, GLenum pname,
GLAPI void APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); const GLint * params);
GLAPI void APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue,
GLubyte alpha);
#endif /* __SDL_GF_OPENGLES_H__ */ #endif /* __SDL_GF_OPENGLES_H__ */
src/video/qnxgf/SDL_gf_pixelfmt.c
View file @ 483f2ba3
...@@ -27,148 +27,148 @@ ...@@ -27,148 +27,148 @@
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_gf_pixelfmt.h" #include "SDL_gf_pixelfmt.h"
gf_format_t qnxgf_sdl_to_gf_pixelformat(uint32_t pixelfmt) gf_format_t
qnxgf_sdl_to_gf_pixelformat(uint32_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case SDL_PIXELFORMAT_INDEX8:
case SDL_PIXELFORMAT_INDEX8: {
{ return GF_FORMAT_PAL8;
return GF_FORMAT_PAL8; }
} break;
break; case SDL_PIXELFORMAT_ARGB1555:
case SDL_PIXELFORMAT_ARGB1555: {
{ return GF_FORMAT_PACK_ARGB1555;
return GF_FORMAT_PACK_ARGB1555; }
} break;
break; case SDL_PIXELFORMAT_ABGR1555:
case SDL_PIXELFORMAT_ABGR1555: {
{ return GF_FORMAT_PACK_ARGB1555;
return GF_FORMAT_PACK_ARGB1555; }
} break;
break; case SDL_PIXELFORMAT_RGB565:
case SDL_PIXELFORMAT_RGB565: {
{ return GF_FORMAT_PACK_RGB565;
return GF_FORMAT_PACK_RGB565; }
} break;
break; case SDL_PIXELFORMAT_RGB888:
case SDL_PIXELFORMAT_RGB888: {
{ return GF_FORMAT_BGR888;
return GF_FORMAT_BGR888; }
} break;
break; case SDL_PIXELFORMAT_BGRA8888:
case SDL_PIXELFORMAT_BGRA8888: {
{ return GF_FORMAT_BGRA8888;
return GF_FORMAT_BGRA8888; }
} break;
break; case SDL_PIXELFORMAT_ARGB8888:
case SDL_PIXELFORMAT_ARGB8888: {
{ return GF_FORMAT_ARGB8888;
return GF_FORMAT_ARGB8888; }
} break;
break; case SDL_PIXELFORMAT_YV12:
case SDL_PIXELFORMAT_YV12: {
{ return GF_FORMAT_PLANAR_YUV_YV12;
return GF_FORMAT_PLANAR_YUV_YV12; }
} break;
break; case SDL_PIXELFORMAT_YUY2:
case SDL_PIXELFORMAT_YUY2: {
{ return GF_FORMAT_PACK_YUV_YUY2;
return GF_FORMAT_PACK_YUV_YUY2; }
} break;
break; case SDL_PIXELFORMAT_UYVY:
case SDL_PIXELFORMAT_UYVY: {
{ return GF_FORMAT_PACK_YUV_UYVY;
return GF_FORMAT_PACK_YUV_UYVY; }
} break;
break; case SDL_PIXELFORMAT_YVYU:
case SDL_PIXELFORMAT_YVYU: {
{ return GF_FORMAT_PACK_YUV_YVYU;
return GF_FORMAT_PACK_YUV_YVYU; }
} break;
break; }
}
return GF_FORMAT_INVALID; return GF_FORMAT_INVALID;
} }
uint32_t qnxgf_gf_to_sdl_pixelformat(gf_format_t pixelfmt) uint32_t
qnxgf_gf_to_sdl_pixelformat(gf_format_t pixelfmt)
{ {
switch(pixelfmt) switch (pixelfmt) {
{ case GF_FORMAT_PAL8:
case GF_FORMAT_PAL8: {
{ return SDL_PIXELFORMAT_INDEX8;
return SDL_PIXELFORMAT_INDEX8; }
} break;
break; case GF_FORMAT_PKLE_ARGB1555:
case GF_FORMAT_PKLE_ARGB1555: {
{ return SDL_PIXELFORMAT_ARGB1555;
return SDL_PIXELFORMAT_ARGB1555; }
} break;
break; case GF_FORMAT_PACK_ARGB1555:
case GF_FORMAT_PACK_ARGB1555: {
{ return SDL_PIXELFORMAT_ARGB1555;
return SDL_PIXELFORMAT_ARGB1555; }
} break;
break; case GF_FORMAT_PKBE_ARGB1555:
case GF_FORMAT_PKBE_ARGB1555: {
{ return SDL_PIXELFORMAT_ABGR1555;
return SDL_PIXELFORMAT_ABGR1555; }
} break;
break; case GF_FORMAT_PKBE_RGB565:
case GF_FORMAT_PKBE_RGB565: {
{ return SDL_PIXELFORMAT_RGB565;
return SDL_PIXELFORMAT_RGB565; }
} break;
break; case GF_FORMAT_PKLE_RGB565:
case GF_FORMAT_PKLE_RGB565: {
{ return SDL_PIXELFORMAT_RGB565;
return SDL_PIXELFORMAT_RGB565; }
} break;
break; case GF_FORMAT_PACK_RGB565:
case GF_FORMAT_PACK_RGB565: {
{ return SDL_PIXELFORMAT_RGB565;
return SDL_PIXELFORMAT_RGB565; }
} break;
break; case GF_FORMAT_BGR888:
case GF_FORMAT_BGR888: {
{ return SDL_PIXELFORMAT_RGB888;
return SDL_PIXELFORMAT_RGB888; }
} break;
break; case GF_FORMAT_BGRA8888:
case GF_FORMAT_BGRA8888: {
{ return SDL_PIXELFORMAT_BGRA8888;
return SDL_PIXELFORMAT_BGRA8888; }
} break;
break; case GF_FORMAT_ARGB8888:
case GF_FORMAT_ARGB8888: {
{ return SDL_PIXELFORMAT_ARGB8888;
return SDL_PIXELFORMAT_ARGB8888; }
} break;
break;
case GF_FORMAT_PLANAR_YUV_YV12: case GF_FORMAT_PLANAR_YUV_YV12:
{ {
return SDL_PIXELFORMAT_YV12; return SDL_PIXELFORMAT_YV12;
} }
break; break;
case GF_FORMAT_PACK_YUV_YUY2: case GF_FORMAT_PACK_YUV_YUY2:
{ {
return SDL_PIXELFORMAT_YUY2; return SDL_PIXELFORMAT_YUY2;
} }
break; break;
case GF_FORMAT_PACK_YUV_UYVY: case GF_FORMAT_PACK_YUV_UYVY:
{ {
return SDL_PIXELFORMAT_UYVY; return SDL_PIXELFORMAT_UYVY;
} }
break; break;
case GF_FORMAT_PACK_YUV_YVYU: case GF_FORMAT_PACK_YUV_YVYU:
{ {
return SDL_PIXELFORMAT_YVYU; return SDL_PIXELFORMAT_YVYU;
} }
break; break;
} }
return SDL_PIXELFORMAT_UNKNOWN; return SDL_PIXELFORMAT_UNKNOWN;
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/video/qnxgf/SDL_gf_pixelfmt.h
View file @ 483f2ba3
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <gf/gf.h> #include <gf/gf.h>
gf_format_t qnxgf_sdl_to_gf_pixelformat(uint32_t pixelfmt); gf_format_t qnxgf_sdl_to_gf_pixelformat(uint32_t pixelfmt);
uint32_t qnxgf_gf_to_sdl_pixelformat(gf_format_t pixelfmt); uint32_t qnxgf_gf_to_sdl_pixelformat(gf_format_t pixelfmt);
#endif /* __SDL_GF_PIXELFMT_H__ */ #endif /* __SDL_GF_PIXELFMT_H__ */
......
src/video/qnxgf/SDL_gf_render.c
View file @ 483f2ba3
...@@ -34,368 +34,392 @@ ...@@ -34,368 +34,392 @@
#include "SDL_gf_render.h" #include "SDL_gf_render.h"
#include "SDL_qnxgf.h" #include "SDL_qnxgf.h"
static SDL_Renderer* gf_createrenderer(SDL_Window* window, Uint32 flags); static SDL_Renderer *gf_createrenderer(SDL_Window * window, Uint32 flags);
static int gf_displaymodechanged(SDL_Renderer* renderer); static int gf_displaymodechanged(SDL_Renderer * renderer);
static int gf_activaterenderer(SDL_Renderer* renderer); static int gf_activaterenderer(SDL_Renderer * renderer);
static int gf_createtexture(SDL_Renderer* renderer, SDL_Texture* texture); static int gf_createtexture(SDL_Renderer * renderer, SDL_Texture * texture);
static int gf_querytexturepixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch); static int gf_querytexturepixels(SDL_Renderer * renderer,
static int gf_settexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color* colors, int firstcolor, int ncolors); SDL_Texture * texture, void **pixels,
static int gf_gettexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Color* colors, int firstcolor, int ncolors); int *pitch);
static int gf_settexturecolormod(SDL_Renderer* renderer, SDL_Texture* texture); static int gf_settexturepalette(SDL_Renderer * renderer,
static int gf_settexturealphamod(SDL_Renderer* renderer, SDL_Texture* texture); SDL_Texture * texture,
static int gf_settextureblendmode(SDL_Renderer* renderer, SDL_Texture* texture); const SDL_Color * colors, int firstcolor,
static int gf_settexturescalemode(SDL_Renderer* renderer, SDL_Texture* texture); int ncolors);
static int gf_updatetexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch); static int gf_gettexturepalette(SDL_Renderer * renderer,
static int gf_locktexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int markDirty, void** pixels, int* pitch); SDL_Texture * texture, SDL_Color * colors,
static void gf_unlocktexture(SDL_Renderer* renderer, SDL_Texture* texture); int firstcolor, int ncolors);
static void gf_dirtytexture(SDL_Renderer* renderer, SDL_Texture* texture, int numrects, const SDL_Rect* rects); static int gf_settexturecolormod(SDL_Renderer * renderer,
static int gf_renderpoint(SDL_Renderer* renderer, int x, int y); SDL_Texture * texture);
static int gf_renderline(SDL_Renderer* renderer, int x1, int y1, int x2, int y2); static int gf_settexturealphamod(SDL_Renderer * renderer,
static int gf_renderfill(SDL_Renderer* renderer, const SDL_Rect* rect); SDL_Texture * texture);
static int gf_rendercopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srcrect, const SDL_Rect* dstrect); static int gf_settextureblendmode(SDL_Renderer * renderer,
static void gf_renderpresent(SDL_Renderer* renderer); SDL_Texture * texture);
static void gf_destroytexture(SDL_Renderer* renderer, SDL_Texture* texture); static int gf_settexturescalemode(SDL_Renderer * renderer,
static void gf_destroyrenderer(SDL_Renderer* renderer); SDL_Texture * texture);
static int gf_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture,
SDL_RenderDriver gf_renderdriver= const SDL_Rect * rect, const void *pixels,
{ int pitch);
static int gf_locktexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, int markDirty, void **pixels,
int *pitch);
static void gf_unlocktexture(SDL_Renderer * renderer, SDL_Texture * texture);
static void gf_dirtytexture(SDL_Renderer * renderer, SDL_Texture * texture,
int numrects, const SDL_Rect * rects);
static int gf_renderpoint(SDL_Renderer * renderer, int x, int y);
static int gf_renderline(SDL_Renderer * renderer, int x1, int y1, int x2,
int y2);
static int gf_renderfill(SDL_Renderer * renderer, const SDL_Rect * rect);
static int gf_rendercopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect, const SDL_Rect * dstrect);
static void gf_renderpresent(SDL_Renderer * renderer);
static void gf_destroytexture(SDL_Renderer * renderer, SDL_Texture * texture);
static void gf_destroyrenderer(SDL_Renderer * renderer);
SDL_RenderDriver gf_renderdriver = {
gf_createrenderer, gf_createrenderer,
{ {
"qnxgf", "qnxgf",
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY | (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 |
SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD |
SDL_RENDERER_ACCELERATED), SDL_RENDERER_ACCELERATED),
(SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR |
SDL_TEXTUREMODULATE_ALPHA), SDL_TEXTUREMODULATE_ALPHA),
(SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | (SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK |
SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD), SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
(SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_SLOW), (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_SLOW),
13, 13,
{ {
SDL_PIXELFORMAT_INDEX8, SDL_PIXELFORMAT_INDEX8,
SDL_PIXELFORMAT_RGB555, SDL_PIXELFORMAT_RGB555,
SDL_PIXELFORMAT_RGB565, SDL_PIXELFORMAT_RGB565,
SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888,
SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888,
SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888,
SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGBA8888,
SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888,
SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGRA8888,
SDL_PIXELFORMAT_YV12, SDL_PIXELFORMAT_YV12,
SDL_PIXELFORMAT_YUY2, SDL_PIXELFORMAT_YUY2,
SDL_PIXELFORMAT_UYVY, SDL_PIXELFORMAT_UYVY,
SDL_PIXELFORMAT_YVYU SDL_PIXELFORMAT_YVYU},
}, 0,
0, 0}
0
}
}; };
static SDL_Renderer* gf_createrenderer(SDL_Window* window, Uint32 flags) static SDL_Renderer *
gf_createrenderer(SDL_Window * window, Uint32 flags)
{ {
SDL_VideoDisplay* display = SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_DisplayData* didata = (SDL_DisplayData*)display->driverdata; SDL_DisplayData *didata = (SDL_DisplayData *) display->driverdata;
SDL_WindowData* wdata = (SDL_WindowData*)window->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
SDL_Renderer* renderer = NULL; SDL_Renderer *renderer = NULL;
SDL_RenderData* rdata = NULL; SDL_RenderData *rdata = NULL;
uint32_t it; uint32_t it;
int32_t jt; int32_t jt;
int32_t status; int32_t status;
/* Check if it is OpenGL ES window */ /* Check if it is OpenGL ES window */
if ((window->flags & SDL_WINDOW_OPENGL)==SDL_WINDOW_OPENGL) if ((window->flags & SDL_WINDOW_OPENGL) == SDL_WINDOW_OPENGL) {
{ /* No error, just no need to create 2D renderer for OpenGL ES window */
/* No error, just no need to create 2D renderer for OpenGL ES window */ return NULL;
return NULL; }
}
/* Allocate new renderer structure */
/* Allocate new renderer structure */ renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(SDL_Renderer));
renderer=(SDL_Renderer*)SDL_calloc(1, sizeof(SDL_Renderer)); if (renderer == NULL) {
if (renderer==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_OutOfMemory(); }
return NULL;
} /* Allocate renderer data */
rdata = (SDL_RenderData *) SDL_calloc(1, sizeof(SDL_RenderData));
/* Allocate renderer data */ if (rdata == NULL) {
rdata=(SDL_RenderData*)SDL_calloc(1, sizeof(SDL_RenderData)); SDL_free(renderer);
if (rdata==NULL) SDL_OutOfMemory();
{ return NULL;
SDL_free(renderer); }
SDL_OutOfMemory();
return NULL; renderer->DisplayModeChanged = gf_displaymodechanged;
} renderer->ActivateRenderer = gf_activaterenderer;
renderer->CreateTexture = gf_createtexture;
renderer->DisplayModeChanged=gf_displaymodechanged; renderer->QueryTexturePixels = gf_querytexturepixels;
renderer->ActivateRenderer=gf_activaterenderer; renderer->SetTexturePalette = gf_settexturepalette;
renderer->CreateTexture=gf_createtexture; renderer->GetTexturePalette = gf_gettexturepalette;
renderer->QueryTexturePixels=gf_querytexturepixels; renderer->SetTextureAlphaMod = gf_settexturealphamod;
renderer->SetTexturePalette=gf_settexturepalette; renderer->SetTextureColorMod = gf_settexturecolormod;
renderer->GetTexturePalette=gf_gettexturepalette; renderer->SetTextureBlendMode = gf_settextureblendmode;
renderer->SetTextureAlphaMod=gf_settexturealphamod; renderer->SetTextureScaleMode = gf_settexturescalemode;
renderer->SetTextureColorMod=gf_settexturecolormod; renderer->UpdateTexture = gf_updatetexture;
renderer->SetTextureBlendMode=gf_settextureblendmode; renderer->LockTexture = gf_locktexture;
renderer->SetTextureScaleMode=gf_settexturescalemode; renderer->UnlockTexture = gf_unlocktexture;
renderer->UpdateTexture=gf_updatetexture; renderer->DirtyTexture = gf_dirtytexture;
renderer->LockTexture=gf_locktexture; renderer->RenderPoint = gf_renderpoint;
renderer->UnlockTexture=gf_unlocktexture; renderer->RenderLine = gf_renderline;
renderer->DirtyTexture=gf_dirtytexture; renderer->RenderFill = gf_renderfill;
renderer->RenderPoint=gf_renderpoint; renderer->RenderCopy = gf_rendercopy;
renderer->RenderLine=gf_renderline; renderer->RenderPresent = gf_renderpresent;
renderer->RenderFill=gf_renderfill; renderer->DestroyTexture = gf_destroytexture;
renderer->RenderCopy=gf_rendercopy; renderer->DestroyRenderer = gf_destroyrenderer;
renderer->RenderPresent = gf_renderpresent; renderer->info = gf_renderdriver.info;
renderer->DestroyTexture = gf_destroytexture; renderer->window = window->id;
renderer->DestroyRenderer = gf_destroyrenderer; renderer->driverdata = rdata;
renderer->info = gf_renderdriver.info;
renderer->window = window->id; /* Set render acceleration flag in case it is accelerated */
renderer->driverdata = rdata; if ((didata->caps & SDL_GF_ACCELERATED) == SDL_GF_ACCELERATED) {
renderer->info.flags = SDL_RENDERER_ACCELERATED;
/* Set render acceleration flag in case it is accelerated */ } else {
if ((didata->caps & SDL_GF_ACCELERATED)==SDL_GF_ACCELERATED) renderer->info.flags &= ~(SDL_RENDERER_ACCELERATED);
{ }
renderer->info.flags=SDL_RENDERER_ACCELERATED;
} rdata->window = window;
else
{ /* Check if upper level requested synchronization on vsync signal */
renderer->info.flags&=~(SDL_RENDERER_ACCELERATED); if ((flags & SDL_RENDERER_PRESENTVSYNC) == SDL_RENDERER_PRESENTVSYNC) {
} rdata->enable_vsync = SDL_TRUE;
} else {
rdata->window=window; rdata->enable_vsync = SDL_FALSE;
}
/* Check if upper level requested synchronization on vsync signal */
if ((flags & SDL_RENDERER_PRESENTVSYNC)==SDL_RENDERER_PRESENTVSYNC) /* Check what buffer copy/flip scheme is requested */
{ rdata->surfaces_count = 0;
rdata->enable_vsync=SDL_TRUE; if ((flags & SDL_RENDERER_SINGLEBUFFER) == SDL_RENDERER_SINGLEBUFFER) {
} if ((flags & SDL_RENDERER_PRESENTDISCARD) ==
else SDL_RENDERER_PRESENTDISCARD) {
{ renderer->info.flags |=
rdata->enable_vsync=SDL_FALSE; SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD;
} } else {
renderer->info.flags |=
/* Check what buffer copy/flip scheme is requested */ SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY;
rdata->surfaces_count=0; }
if ((flags & SDL_RENDERER_SINGLEBUFFER)==SDL_RENDERER_SINGLEBUFFER) rdata->surfaces_count = 1;
{ rdata->surface_visible_idx = 0;
if ((flags & SDL_RENDERER_PRESENTDISCARD)==SDL_RENDERER_PRESENTDISCARD) rdata->surface_render_idx = 0;
{ } else {
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD; if ((flags & SDL_RENDERER_PRESENTFLIP2) == SDL_RENDERER_PRESENTFLIP2) {
} renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
else rdata->surfaces_count = 2;
{ rdata->surface_visible_idx = 0;
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY; rdata->surface_render_idx = 1;
} } else {
rdata->surfaces_count=1; if ((flags & SDL_RENDERER_PRESENTFLIP3) ==
rdata->surface_visible_idx=0; SDL_RENDERER_PRESENTFLIP3) {
rdata->surface_render_idx=0; renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
} rdata->surfaces_count = 3;
else rdata->surface_visible_idx = 0;
{ rdata->surface_render_idx = 1;
if ((flags & SDL_RENDERER_PRESENTFLIP2)==SDL_RENDERER_PRESENTFLIP2) } else {
{ renderer->info.flags |=
renderer->info.flags|=SDL_RENDERER_PRESENTFLIP2; SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY;
rdata->surfaces_count=2; rdata->surfaces_count = 1;
rdata->surface_visible_idx=0; rdata->surface_visible_idx = 0;
rdata->surface_render_idx=1; rdata->surface_render_idx = 0;
} }
else }
{ }
if ((flags & SDL_RENDERER_PRESENTFLIP3)==SDL_RENDERER_PRESENTFLIP3)
{ /* Create layer surfaces, which could be visible */
renderer->info.flags|=SDL_RENDERER_PRESENTFLIP3; for (it = 0; it < rdata->surfaces_count; it++) {
rdata->surfaces_count=3; /* TODO: add palette creation */
rdata->surface_visible_idx=0;
rdata->surface_render_idx=1; /* Create displayable surfaces */
} status =
else gf_surface_create_layer(&rdata->surface[it], &didata->layer, 1, 0,
{ didata->current_mode.w,
renderer->info.flags|=SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY; didata->current_mode.h,
rdata->surfaces_count=1; qnxgf_sdl_to_gf_pixelformat(didata->
rdata->surface_visible_idx=0; current_mode.
rdata->surface_render_idx=0; format), NULL,
} GF_SURFACE_CREATE_2D_ACCESSIBLE);
}
} if (status != GF_ERR_OK) {
/* Free already allocated surfaces */
/* Create layer surfaces, which could be visible */ for (jt = it - 1; jt > 0; jt--) {
for (it=0; it<rdata->surfaces_count; it++) gf_surface_free(rdata->surface[jt]);
{ rdata->surface[jt] = NULL;
/* TODO: add palette creation */ }
SDL_free(rdata);
/* Create displayable surfaces */ SDL_free(renderer);
status=gf_surface_create_layer(&rdata->surface[it], &didata->layer, 1, 0, if (status == GF_ERR_MEM) {
didata->current_mode.w, didata->current_mode.h, SDL_SetError("unsufficient free video memory");
qnxgf_sdl_to_gf_pixelformat(didata->current_mode.format), NULL, } else {
GF_SURFACE_CREATE_2D_ACCESSIBLE); SDL_SetError("error during displayable surface creation");
}
if (status!=GF_ERR_OK) return NULL;
{ }
/* Free already allocated surfaces */
for (jt=it-1; jt>0; jt--) /* Get detailed information about allocated surface */
{ gf_surface_get_info(rdata->surface[it], &rdata->surface_info[it]);
gf_surface_free(rdata->surface[jt]); }
rdata->surface[jt]=NULL;
} return renderer;
SDL_free(rdata);
SDL_free(renderer);
if (status==GF_ERR_MEM)
{
SDL_SetError("unsufficient free video memory");
}
else
{
SDL_SetError("error during displayable surface creation");
}
return NULL;
}
/* Get detailed information about allocated surface */
gf_surface_get_info(rdata->surface[it], &rdata->surface_info[it]);
}
return renderer;
} }
void gf_addrenderdriver(_THIS) void
gf_addrenderdriver(_THIS)
{ {
uint32_t it; uint32_t it;
for (it=0; it<_this->num_displays; it++) for (it = 0; it < _this->num_displays; it++) {
{ SDL_AddRenderDriver(it, &gf_renderdriver);
SDL_AddRenderDriver(it, &gf_renderdriver); }
}
} }
/****************************************************************************/ /****************************************************************************/
/* SDL render interface */ /* SDL render interface */
/****************************************************************************/ /****************************************************************************/
static int gf_displaymodechanged(SDL_Renderer* renderer) static int
gf_displaymodechanged(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
/* Remove all allocated surfaces, they are no more valid */ /* Remove all allocated surfaces, they are no more valid */
/* TODO: Add video mode change detection and new parameters detection */ /* TODO: Add video mode change detection and new parameters detection */
return 0; return 0;
} }
static int gf_activaterenderer(SDL_Renderer* renderer) static int
gf_activaterenderer(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
SDL_VideoDisplay* display = SDL_GetDisplayFromWindow(rdata->window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(rdata->window);
SDL_DisplayData* didata = (SDL_DisplayData*)display->driverdata; SDL_DisplayData *didata = (SDL_DisplayData *) display->driverdata;
/* Setup current surface as visible */ /* Setup current surface as visible */
// gf_layer_set_surfaces(didata->layer, &rdata->surface[rdata->surface_visible_idx], 1); // gf_layer_set_surfaces(didata->layer, &rdata->surface[rdata->surface_visible_idx], 1);
/* Set visible surface when hardware in idle state */ /* Set visible surface when hardware in idle state */
// gf_layer_update(didata->layer, GF_LAYER_UPDATE_NO_WAIT_IDLE); // gf_layer_update(didata->layer, GF_LAYER_UPDATE_NO_WAIT_IDLE);
return 0; return 0;
} }
static int gf_createtexture(SDL_Renderer* renderer, SDL_Texture* texture) static int
gf_createtexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
SDL_RenderData* renderdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *renderdata = (SDL_RenderData *) renderer->driverdata;
SDL_Window* window=SDL_GetWindowFromID(renderer->window); SDL_Window *window = SDL_GetWindowFromID(renderer->window);
SDL_VideoDisplay* display=SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_TextureData* tdata=NULL; SDL_TextureData *tdata = NULL;
/* Allocate texture driver data */ /* Allocate texture driver data */
tdata=(SDL_TextureData*)SDL_calloc(1, sizeof(SDL_TextureData)); tdata = (SDL_TextureData *) SDL_calloc(1, sizeof(SDL_TextureData));
if (tdata==NULL) if (tdata == NULL) {
{ SDL_OutOfMemory();
SDL_OutOfMemory(); return -1;
return -1; }
}
/* Set texture driver data */
/* Set texture driver data */ texture->driverdata = tdata;
texture->driverdata=tdata;
} }
static int gf_querytexturepixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch) static int
gf_querytexturepixels(SDL_Renderer * renderer, SDL_Texture * texture,
void **pixels, int *pitch)
{ {
} }
static int gf_settexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color* colors, int firstcolor, int ncolors) static int
gf_settexturepalette(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Color * colors, int firstcolor, int ncolors)
{ {
} }
static int gf_gettexturepalette(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Color* colors, int firstcolor, int ncolors) static int
gf_gettexturepalette(SDL_Renderer * renderer, SDL_Texture * texture,
SDL_Color * colors, int firstcolor, int ncolors)
{ {
} }
static int gf_settexturecolormod(SDL_Renderer* renderer, SDL_Texture* texture) static int
gf_settexturecolormod(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int gf_settexturealphamod(SDL_Renderer* renderer, SDL_Texture* texture) static int
gf_settexturealphamod(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int gf_settextureblendmode(SDL_Renderer* renderer, SDL_Texture* texture) static int
gf_settextureblendmode(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int gf_settexturescalemode(SDL_Renderer* renderer, SDL_Texture* texture) static int
gf_settexturescalemode(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static int gf_updatetexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch) static int
gf_updatetexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels, int pitch)
{ {
} }
static int gf_locktexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int markDirty, void** pixels, int* pitch) static int
gf_locktexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, int markDirty, void **pixels,
int *pitch)
{ {
} }
static void gf_unlocktexture(SDL_Renderer* renderer, SDL_Texture* texture) static void
gf_unlocktexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static void gf_dirtytexture(SDL_Renderer* renderer, SDL_Texture* texture, int numrects, const SDL_Rect* rects) static void
gf_dirtytexture(SDL_Renderer * renderer, SDL_Texture * texture, int numrects,
const SDL_Rect * rects)
{ {
} }
static int gf_renderpoint(SDL_Renderer* renderer, int x, int y) static int
gf_renderpoint(SDL_Renderer * renderer, int x, int y)
{ {
} }
static int gf_renderline(SDL_Renderer* renderer, int x1, int y1, int x2, int y2) static int
gf_renderline(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
{ {
} }
static int gf_renderfill(SDL_Renderer* renderer, const SDL_Rect* rect) static int
gf_renderfill(SDL_Renderer * renderer, const SDL_Rect * rect)
{ {
} }
static int gf_rendercopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srcrect, const SDL_Rect* dstrect) static int
gf_rendercopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect, const SDL_Rect * dstrect)
{ {
} }
static void gf_renderpresent(SDL_Renderer* renderer) static void
gf_renderpresent(SDL_Renderer * renderer)
{ {
} }
static void gf_destroytexture(SDL_Renderer* renderer, SDL_Texture* texture) static void
gf_destroytexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
} }
static void gf_destroyrenderer(SDL_Renderer* renderer) static void
gf_destroyrenderer(SDL_Renderer * renderer)
{ {
SDL_RenderData* rdata=(SDL_RenderData*)renderer->driverdata; SDL_RenderData *rdata = (SDL_RenderData *) renderer->driverdata;
uint32_t it; uint32_t it;
for (it=0; it<rdata->surfaces_count; it++) for (it = 0; it < rdata->surfaces_count; it++) {
{ if (rdata->surface[it] != NULL) {
if (rdata->surface[it]!=NULL) gf_surface_free(rdata->surface[it]);
{ }
gf_surface_free(rdata->surface[it]); }
}
}
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/video/qnxgf/SDL_gf_render.h
View file @ 483f2ba3
...@@ -35,19 +35,19 @@ ...@@ -35,19 +35,19 @@
typedef struct SDL_RenderData typedef struct SDL_RenderData
{ {
SDL_Window* window; /* SDL window type */ SDL_Window *window; /* SDL window type */
SDL_bool enable_vsync; /* VSYNC flip synchronization enable */ SDL_bool enable_vsync; /* VSYNC flip synchronization enable */
gf_surface_t surface[SDL_GF_MAX_SURFACES]; /* Surface handles */ gf_surface_t surface[SDL_GF_MAX_SURFACES]; /* Surface handles */
gf_surface_info_t surface_info[SDL_GF_MAX_SURFACES]; /* Surface info */ gf_surface_info_t surface_info[SDL_GF_MAX_SURFACES]; /* Surface info */
uint32_t surface_visible_idx; /* Index of visible surface */ uint32_t surface_visible_idx; /* Index of visible surface */
uint32_t surface_render_idx; /* Index of render surface */ uint32_t surface_render_idx; /* Index of render surface */
uint32_t surfaces_count; /* Amount of allocated surfaces */ uint32_t surfaces_count; /* Amount of allocated surfaces */
} SDL_RenderData; } SDL_RenderData;
typedef struct SDL_TextureData typedef struct SDL_TextureData
{ {
gf_surface_t surface; gf_surface_t surface;
gf_surface_info_t surface_info; gf_surface_info_t surface_info;
} SDL_TextureData; } SDL_TextureData;
extern void gf_addrenderdriver(_THIS); extern void gf_addrenderdriver(_THIS);
......
src/video/qnxgf/SDL_hiddi_keyboard.h
View file @ 483f2ba3
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
/* PS/2 and USB keyboards are generating this packet */ /* PS/2 and USB keyboards are generating this packet */
typedef struct key_packet typedef struct key_packet
{ {
uint8_t modifiers; uint8_t modifiers;
uint8_t data; uint8_t data;
uint8_t codes[6]; uint8_t codes[6];
} key_packet; } key_packet;
/* Key modifier codes */ /* Key modifier codes */
......
src/video/qnxgf/SDL_hiddi_mouse.h
View file @ 483f2ba3
...@@ -32,38 +32,38 @@ ...@@ -32,38 +32,38 @@
/* USB keyboard multimedia keys are generating this packet */ /* USB keyboard multimedia keys are generating this packet */
typedef struct mouse_packet2 typedef struct mouse_packet2
{ {
uint8_t buttons; uint8_t buttons;
int8_t wheel; int8_t wheel;
} mouse_packet2; } mouse_packet2;
/* PS/2 mice are generating this packet */ /* PS/2 mice are generating this packet */
typedef struct mouse_packet4 typedef struct mouse_packet4
{ {
uint8_t buttons; uint8_t buttons;
int8_t horizontal; int8_t horizontal;
int8_t vertical; int8_t vertical;
int8_t wheel; int8_t wheel;
} mouse_packet4; } mouse_packet4;
/* USB keyboard with mice wheel onboard generating this packet */ /* USB keyboard with mice wheel onboard generating this packet */
typedef struct mouse_packet5 typedef struct mouse_packet5
{ {
uint8_t buttons; uint8_t buttons;
int8_t horizontal; int8_t horizontal;
int8_t vertical; int8_t vertical;
int8_t wheel; int8_t wheel;
uint8_t state; uint8_t state;
} mouse_packet5; } mouse_packet5;
/* USB multi-button mice are generating this packet */ /* USB multi-button mice are generating this packet */
typedef struct mouse_packet8 typedef struct mouse_packet8
{ {
uint8_t buttons; uint8_t buttons;
int8_t horizontal; int8_t horizontal;
int8_t vertical; int8_t vertical;
int8_t wheel; int8_t wheel;
int16_t horizontal_precision; int16_t horizontal_precision;
int16_t vertical_precision; int16_t vertical_precision;
} mouse_packet8; } mouse_packet8;
#endif /* __SDL_HIDDI_MOUSE_H__ */ #endif /* __SDL_HIDDI_MOUSE_H__ */
src/video/qnxgf/SDL_qnxgf.c
View file @ 483f2ba3
This source diff could not be displayed because it is too large. You can view the blob instead.
src/video/qnxgf/SDL_qnxgf.h
View file @ 483f2ba3
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
#include <gf/gf3d.h> #include <gf/gf3d.h>
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
#include <GLES/egl.h> #include <GLES/egl.h>
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
typedef struct SDL_VideoData typedef struct SDL_VideoData
{ {
gf_dev_t gfdev; /* GF device handle */ gf_dev_t gfdev; /* GF device handle */
gf_dev_info_t gfdev_info; /* GF device information */ gf_dev_info_t gfdev_info; /* GF device information */
SDL_bool gfinitialized; /* GF device initialization status */ SDL_bool gfinitialized; /* GF device initialization status */
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
EGLDisplay egldisplay; /* OpenGL ES display connection */ EGLDisplay egldisplay; /* OpenGL ES display connection */
uint32_t egl_refcount; /* OpenGL ES reference count */ uint32_t egl_refcount; /* OpenGL ES reference count */
uint32_t swapinterval; /* OpenGL ES default swap interval */ uint32_t swapinterval; /* OpenGL ES default swap interval */
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_VideoData; } SDL_VideoData;
#define SDL_VIDEO_GF_DEVICENAME_MAX 257 #define SDL_VIDEO_GF_DEVICENAME_MAX 257
...@@ -53,18 +53,18 @@ typedef struct SDL_VideoData ...@@ -53,18 +53,18 @@ typedef struct SDL_VideoData
typedef struct SDL_DisplayData typedef struct SDL_DisplayData
{ {
gf_display_info_t display_info; /* GF display information */ gf_display_info_t display_info; /* GF display information */
gf_display_t display; /* GF display handle */ gf_display_t display; /* GF display handle */
uint32_t custom_refresh; /* Custom refresh rate for all modes */ uint32_t custom_refresh; /* Custom refresh rate for all modes */
SDL_DisplayMode current_mode; /* Current video mode */ SDL_DisplayMode current_mode; /* Current video mode */
uint8_t description[SDL_VIDEO_GF_DEVICENAME_MAX]; uint8_t description[SDL_VIDEO_GF_DEVICENAME_MAX];
/* Device description */ /* Device description */
uint32_t caps; /* Device capabilities */ uint32_t caps; /* Device capabilities */
SDL_bool layer_attached; /* Layer attach status */ SDL_bool layer_attached; /* Layer attach status */
gf_layer_t layer; /* Graphics layer to which attached */ gf_layer_t layer; /* Graphics layer to which attached */
gf_surface_t surface[3]; /* Visible surface on the display */ gf_surface_t surface[3]; /* Visible surface on the display */
SDL_bool cursor_visible; /* SDL_TRUE if cursor visible */ SDL_bool cursor_visible; /* SDL_TRUE if cursor visible */
gf_cursor_t cursor; /* Cursor shape which was set last */ gf_cursor_t cursor; /* Cursor shape which was set last */
} SDL_DisplayData; } SDL_DisplayData;
/* Maximum amount of OpenGL ES framebuffer configurations */ /* Maximum amount of OpenGL ES framebuffer configurations */
...@@ -72,23 +72,23 @@ typedef struct SDL_DisplayData ...@@ -72,23 +72,23 @@ typedef struct SDL_DisplayData
typedef struct SDL_WindowData typedef struct SDL_WindowData
{ {
SDL_bool uses_gles; /* true if window support OpenGL ES */ SDL_bool uses_gles; /* true if window support OpenGL ES */
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
gf_3d_target_t target; /* OpenGL ES window target */ gf_3d_target_t target; /* OpenGL ES window target */
SDL_bool target_created; /* GF 3D target is created if true */ SDL_bool target_created; /* GF 3D target is created if true */
EGLConfig gles_configs[SDL_VIDEO_GF_OPENGLES_CONFS]; EGLConfig gles_configs[SDL_VIDEO_GF_OPENGLES_CONFS];
/* OpenGL ES framebuffer confs */ /* OpenGL ES framebuffer confs */
EGLint gles_config; /* Config index in the array of cfgs */ EGLint gles_config; /* Config index in the array of cfgs */
EGLContext gles_context; /* OpenGL ES context */ EGLContext gles_context; /* OpenGL ES context */
EGLint gles_attributes[256]; /* OpenGL ES attributes for context */ EGLint gles_attributes[256]; /* OpenGL ES attributes for context */
EGLSurface gles_surface; /* OpenGL ES target rendering surface */ EGLSurface gles_surface; /* OpenGL ES target rendering surface */
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_WindowData; } SDL_WindowData;
typedef struct SDL_GLDriverData typedef struct SDL_GLDriverData
{ {
#if defined(SDL_VIDEO_OPENGL_ES) #if defined(SDL_VIDEO_OPENGL_ES)
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
} SDL_GLDriverData; } SDL_GLDriverData;
/****************************************************************************/ /****************************************************************************/
...@@ -96,59 +96,60 @@ typedef struct SDL_GLDriverData ...@@ -96,59 +96,60 @@ typedef struct SDL_GLDriverData
/****************************************************************************/ /****************************************************************************/
typedef struct GF_DeviceCaps typedef struct GF_DeviceCaps
{ {
uint8_t* name; uint8_t *name;
uint32_t caps; uint32_t caps;
} GF_DeviceCaps; } GF_DeviceCaps;
#define SDL_GF_UNACCELERATED 0x00000000 /* driver is unaccelerated */ #define SDL_GF_UNACCELERATED 0x00000000 /* driver is unaccelerated */
#define SDL_GF_ACCELERATED 0x00000001 /* driver is accelerated */ #define SDL_GF_ACCELERATED 0x00000001 /* driver is accelerated */
#define SDL_GF_NOLOWRESOLUTION 0x00000000 /* no modes below 640x480 */ #define SDL_GF_NOLOWRESOLUTION 0x00000000 /* no modes below 640x480 */
#define SDL_GF_LOWRESOLUTION 0x00000002 /* support modes <640x480 */ #define SDL_GF_LOWRESOLUTION 0x00000002 /* support modes <640x480 */
#define SDL_GF_UNACCELERATED_3D 0x00000000 /* software OpenGL ES */ #define SDL_GF_UNACCELERATED_3D 0x00000000 /* software OpenGL ES */
#define SDL_GF_ACCELERATED_3D 0x00000004 /* hardware acc. OpenGL ES */ #define SDL_GF_ACCELERATED_3D 0x00000004 /* hardware acc. OpenGL ES */
#define SDL_GF_NOVIDEOMEMORY 0x00000000 /* no video memory alloc. */ #define SDL_GF_NOVIDEOMEMORY 0x00000000 /* no video memory alloc. */
#define SDL_GF_VIDEOMEMORY 0x00000008 /* has video memory alloc. */ #define SDL_GF_VIDEOMEMORY 0x00000008 /* has video memory alloc. */
/****************************************************************************/ /****************************************************************************/
/* SDL_VideoDevice functions declaration */ /* SDL_VideoDevice functions declaration */
/****************************************************************************/ /****************************************************************************/
/* Display and window functions */ /* Display and window functions */
int qnxgf_videoinit(_THIS); int qnxgf_videoinit(_THIS);
void qnxgf_videoquit(_THIS); void qnxgf_videoquit(_THIS);
void qnxgf_getdisplaymodes(_THIS); void qnxgf_getdisplaymodes(_THIS);
int qnxgf_setdisplaymode(_THIS, SDL_DisplayMode* mode); int qnxgf_setdisplaymode(_THIS, SDL_DisplayMode * mode);
int qnxgf_setdisplaypalette(_THIS, SDL_Palette* palette); int qnxgf_setdisplaypalette(_THIS, SDL_Palette * palette);
int qnxgf_getdisplaypalette(_THIS, SDL_Palette* palette); int qnxgf_getdisplaypalette(_THIS, SDL_Palette * palette);
int qnxgf_setdisplaygammaramp(_THIS, Uint16* ramp); int qnxgf_setdisplaygammaramp(_THIS, Uint16 * ramp);
int qnxgf_getdisplaygammaramp(_THIS, Uint16* ramp); int qnxgf_getdisplaygammaramp(_THIS, Uint16 * ramp);
int qnxgf_createwindow(_THIS, SDL_Window* window); int qnxgf_createwindow(_THIS, SDL_Window * window);
int qnxgf_createwindowfrom(_THIS, SDL_Window* window, const void* data); int qnxgf_createwindowfrom(_THIS, SDL_Window * window, const void *data);
void qnxgf_setwindowtitle(_THIS, SDL_Window* window); void qnxgf_setwindowtitle(_THIS, SDL_Window * window);
void qnxgf_setwindowicon(_THIS, SDL_Window* window, SDL_Surface* icon); void qnxgf_setwindowicon(_THIS, SDL_Window * window, SDL_Surface * icon);
void qnxgf_setwindowposition(_THIS, SDL_Window* window); void qnxgf_setwindowposition(_THIS, SDL_Window * window);
void qnxgf_setwindowsize(_THIS, SDL_Window* window); void qnxgf_setwindowsize(_THIS, SDL_Window * window);
void qnxgf_showwindow(_THIS, SDL_Window* window); void qnxgf_showwindow(_THIS, SDL_Window * window);
void qnxgf_hidewindow(_THIS, SDL_Window* window); void qnxgf_hidewindow(_THIS, SDL_Window * window);
void qnxgf_raisewindow(_THIS, SDL_Window* window); void qnxgf_raisewindow(_THIS, SDL_Window * window);
void qnxgf_maximizewindow(_THIS, SDL_Window* window); void qnxgf_maximizewindow(_THIS, SDL_Window * window);
void qnxgf_minimizewindow(_THIS, SDL_Window* window); void qnxgf_minimizewindow(_THIS, SDL_Window * window);
void qnxgf_restorewindow(_THIS, SDL_Window* window); void qnxgf_restorewindow(_THIS, SDL_Window * window);
void qnxgf_setwindowgrab(_THIS, SDL_Window* window); void qnxgf_setwindowgrab(_THIS, SDL_Window * window);
void qnxgf_destroywindow(_THIS, SDL_Window* window); void qnxgf_destroywindow(_THIS, SDL_Window * window);
/* Window manager function */ /* Window manager function */
SDL_bool qnxgf_getwindowwminfo(_THIS, SDL_Window* window, struct SDL_SysWMinfo* info); SDL_bool qnxgf_getwindowwminfo(_THIS, SDL_Window * window,
struct SDL_SysWMinfo *info);
/* OpenGL/OpenGL ES functions */ /* OpenGL/OpenGL ES functions */
int qnxgf_gl_loadlibrary(_THIS, const char* path); int qnxgf_gl_loadlibrary(_THIS, const char *path);
void* qnxgf_gl_getprocaddres(_THIS, const char* proc); void *qnxgf_gl_getprocaddres(_THIS, const char *proc);
void qnxgf_gl_unloadlibrary(_THIS); void qnxgf_gl_unloadlibrary(_THIS);
SDL_GLContext qnxgf_gl_createcontext(_THIS, SDL_Window* window); SDL_GLContext qnxgf_gl_createcontext(_THIS, SDL_Window * window);
int qnxgf_gl_makecurrent(_THIS, SDL_Window* window, SDL_GLContext context); int qnxgf_gl_makecurrent(_THIS, SDL_Window * window, SDL_GLContext context);
int qnxgf_gl_setswapinterval(_THIS, int interval); int qnxgf_gl_setswapinterval(_THIS, int interval);
int qnxgf_gl_getswapinterval(_THIS); int qnxgf_gl_getswapinterval(_THIS);
void qnxgf_gl_swapwindow(_THIS, SDL_Window* window); void qnxgf_gl_swapwindow(_THIS, SDL_Window * window);
void qnxgf_gl_deletecontext(_THIS, SDL_GLContext context); void qnxgf_gl_deletecontext(_THIS, SDL_GLContext context);
/* Event handling function */ /* Event handling function */
......
src/video/win32/SDL_gdirender.c
View file @ 483f2ba3
...@@ -481,7 +481,7 @@ GDI_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -481,7 +481,7 @@ GDI_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
/* Crap, we've lost the original pixel data... *sigh* */ /* Crap, we've lost the original pixel data... *sigh* */
} }
return 0; return 0;
#ifndef _WIN32_WCE /* WinCE has no alphablend */ #ifndef _WIN32_WCE /* WinCE has no alphablend */
case SDL_BLENDMODE_MASK: case SDL_BLENDMODE_MASK:
case SDL_BLENDMODE_BLEND: case SDL_BLENDMODE_BLEND:
if (!data->premultiplied && data->pixels) { if (!data->premultiplied && data->pixels) {
...@@ -627,7 +627,7 @@ GDI_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -627,7 +627,7 @@ GDI_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
pitch); pitch);
} else if (data->pixels) { } else if (data->pixels) {
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
/* WinCE has no GdiFlush */ /* WinCE has no GdiFlush */
GdiFlush(); GdiFlush();
#endif #endif
*pixels = *pixels =
......
src/video/win32/SDL_win32events.c
View file @ 483f2ba3
...@@ -191,12 +191,12 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -191,12 +191,12 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
0, 0); 0, 0);
SDL_SendWindowEvent(data->windowID, SDL_SendWindowEvent(data->windowID,
SDL_WINDOWEVENT_RESTORED, 0, 0); SDL_WINDOWEVENT_RESTORED, 0, 0);
#ifndef _WIN32_WCE /* WinCE misses IsZoomed() */ #ifndef _WIN32_WCE /* WinCE misses IsZoomed() */
if (IsZoomed(hwnd)) { if (IsZoomed(hwnd)) {
SDL_SendWindowEvent(data->windowID, SDL_SendWindowEvent(data->windowID,
SDL_WINDOWEVENT_MAXIMIZED, 0, 0); SDL_WINDOWEVENT_MAXIMIZED, 0, 0);
} }
#endif #endif
if (keyboard && keyboard->focus != data->windowID) { if (keyboard && keyboard->focus != data->windowID) {
SDL_SetKeyboardFocus(index, data->windowID); SDL_SetKeyboardFocus(index, data->windowID);
} }
...@@ -218,18 +218,18 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -218,18 +218,18 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
*/ */
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0); SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0);
break; break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0); SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0);
SDL_SendMouseButton(0, SDL_PRESSED, SDL_BUTTON_LEFT); SDL_SendMouseButton(0, SDL_PRESSED, SDL_BUTTON_LEFT);
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0); SDL_SendMouseMotion(0, 0, LOWORD(lParam), HIWORD(lParam), 0);
SDL_SendMouseButton(0, SDL_RELEASED, SDL_BUTTON_LEFT); SDL_SendMouseButton(0, SDL_RELEASED, SDL_BUTTON_LEFT);
break; break;
#else /* _WIN32_WCE */ #else /* _WIN32_WCE */
case WM_INPUT: /* mouse events */ case WM_INPUT: /* mouse events */
...@@ -261,7 +261,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -261,7 +261,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
} }
} }
GetCursorPos(&point); GetCursorPos(&point);
ScreenToClient(hwnd, &point); ScreenToClient(hwnd, &point);
...@@ -314,7 +314,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -314,7 +314,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
return (0); return (0);
#endif /* _WIN32_WCE */ #endif /* _WIN32_WCE */
case WM_MOUSELEAVE: case WM_MOUSELEAVE:
{ {
int i; int i;
...@@ -598,7 +598,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -598,7 +598,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_NCPAINT: case WM_NCPAINT:
{ {
if (SDL_GetWindowFlags(data->windowID) & SDL_WINDOW_FOREIGN) { if (SDL_GetWindowFlags(data->windowID) & SDL_WINDOW_FOREIGN) {
return(0); return (0);
} }
break; break;
} }
......
src/video/win32/SDL_win32gamma.c
View file @ 483f2ba3
...@@ -28,7 +28,7 @@ int ...@@ -28,7 +28,7 @@ int
WIN_SetDisplayGammaRamp(_THIS, Uint16 * ramp) WIN_SetDisplayGammaRamp(_THIS, Uint16 * ramp)
{ {
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
return -1; return -1;
#else #else
SDL_DisplayData *data = (SDL_DisplayData *) SDL_CurrentDisplay.driverdata; SDL_DisplayData *data = (SDL_DisplayData *) SDL_CurrentDisplay.driverdata;
HDC hdc; HDC hdc;
...@@ -50,7 +50,7 @@ int ...@@ -50,7 +50,7 @@ int
WIN_GetDisplayGammaRamp(_THIS, Uint16 * ramp) WIN_GetDisplayGammaRamp(_THIS, Uint16 * ramp)
{ {
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
return -1; return -1;
#else #else
SDL_DisplayData *data = (SDL_DisplayData *) SDL_CurrentDisplay.driverdata; SDL_DisplayData *data = (SDL_DisplayData *) SDL_CurrentDisplay.driverdata;
HDC hdc; HDC hdc;
......
src/video/win32/SDL_win32modes.c
View file @ 483f2ba3
...@@ -55,10 +55,10 @@ WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode) ...@@ -55,10 +55,10 @@ WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
mode->driverdata = data; mode->driverdata = data;
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
/* In WinCE EnumDisplaySettings(ENUM_CURRENT_SETTINGS) doesn't take the user defined orientation /* In WinCE EnumDisplaySettings(ENUM_CURRENT_SETTINGS) doesn't take the user defined orientation
into account but GetSystemMetrixs does. */ into account but GetSystemMetrixs does. */
if(index == ENUM_CURRENT_SETTINGS) { if (index == ENUM_CURRENT_SETTINGS) {
mode->w = GetSystemMetrics(SM_CXSCREEN); mode->w = GetSystemMetrics(SM_CXSCREEN);
mode->h = GetSystemMetrics(SM_CYSCREEN); mode->h = GetSystemMetrics(SM_CYSCREEN);
} }
#endif #endif
...@@ -211,12 +211,12 @@ WIN_SetDisplayMode(_THIS, SDL_DisplayMode * mode) ...@@ -211,12 +211,12 @@ WIN_SetDisplayMode(_THIS, SDL_DisplayMode * mode)
{ {
SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata; SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
LONG status; LONG status;
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
/* TODO: implement correctly. /* TODO: implement correctly.
On my Asus MyPAL, if I execute the code below On my Asus MyPAL, if I execute the code below
I get DISP_CHANGE_BADFLAGS and the Titlebar of the fullscreen window stays I get DISP_CHANGE_BADFLAGS and the Titlebar of the fullscreen window stays
visible ... (SDL_RaiseWindow() would fix that one)*/ visible ... (SDL_RaiseWindow() would fix that one) */
return 0; return 0;
#endif #endif
......
src/video/win32/SDL_win32opengl.c
View file @ 483f2ba3
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
#endif #endif
typedef HGLRC (APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int * attribList); typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
HGLRC
hShareContext,
const int
*attribList);
int int
WIN_GL_LoadLibrary(_THIS, const char *path) WIN_GL_LoadLibrary(_THIS, const char *path)
...@@ -502,17 +506,19 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window) ...@@ -502,17 +506,19 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window)
PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB; PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
HGLRC temp_context = _this->gl_data->wglCreateContext(hdc); HGLRC temp_context = _this->gl_data->wglCreateContext(hdc);
if (!temp_context) { if (!temp_context) {
SDL_SetError("Could not create GL context"); SDL_SetError("Could not create GL context");
return NULL; return NULL;
} }
/* Make the context current */ /* Make the context current */
if (WIN_GL_MakeCurrent(_this, window, temp_context) < 0) { if (WIN_GL_MakeCurrent(_this, window, temp_context) < 0) {
WIN_GL_DeleteContext(_this, temp_context); WIN_GL_DeleteContext(_this, temp_context);
return NULL; return NULL;
} }
wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) _this->gl_data->wglGetProcAddress("wglCreateContextAttribsARB"); wglCreateContextAttribsARB =
(PFNWGLCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
wglGetProcAddress("wglCreateContextAttribsARB");
if (!wglCreateContextAttribsARB) { if (!wglCreateContextAttribsARB) {
SDL_SetError("GL 3.x is not supported"); SDL_SetError("GL 3.x is not supported");
context = temp_context; context = temp_context;
...@@ -520,7 +526,7 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window) ...@@ -520,7 +526,7 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window)
int attribs[] = { int attribs[] = {
WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version,
WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version,
0 0
}; };
/* Create the GL 3.x context */ /* Create the GL 3.x context */
context = wglCreateContextAttribsARB(hdc, 0, attribs); context = wglCreateContextAttribsARB(hdc, 0, attribs);
...@@ -528,7 +534,7 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window) ...@@ -528,7 +534,7 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window)
_this->gl_data->wglDeleteContext(temp_context); _this->gl_data->wglDeleteContext(temp_context);
} }
} }
if (!context) { if (!context) {
SDL_SetError("Could not create GL context"); SDL_SetError("Could not create GL context");
return NULL; return NULL;
......
src/video/win32/SDL_win32window.c
View file @ 483f2ba3
...@@ -242,8 +242,7 @@ WIN_CreateWindow(_THIS, SDL_Window * window) ...@@ -242,8 +242,7 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
} }
g_hCtx[window->id] = videodata->WTOpenA(hwnd, &lc, TRUE); g_hCtx[window->id] = videodata->WTOpenA(hwnd, &lc, TRUE);
} }
#ifndef _WIN32_WCE /* has no RawInput */
#ifndef _WIN32_WCE /* has no RawInput */
/* we're telling the window, we want it to report raw input events from mice */ /* we're telling the window, we want it to report raw input events from mice */
Rid.usUsagePage = 0x01; Rid.usUsagePage = 0x01;
Rid.usUsage = 0x02; Rid.usUsage = 0x02;
......
src/video/x11/SDL_x11opengl.c
View file @ 483f2ba3
...@@ -77,7 +77,13 @@ ...@@ -77,7 +77,13 @@
static void X11_GL_InitExtensions(_THIS); static void X11_GL_InitExtensions(_THIS);
/* Typedef for the GL 3.0 context creation function */ /* Typedef for the GL 3.0 context creation function */
typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
GLXFBConfig config,
GLXContext
share_context,
Bool direct,
const int
*attrib_list);
int int
X11_GL_LoadLibrary(_THIS, const char *path) X11_GL_LoadLibrary(_THIS, const char *path)
...@@ -283,7 +289,7 @@ X11_GL_GetVisual(_THIS, Display * display, int screen) ...@@ -283,7 +289,7 @@ X11_GL_GetVisual(_THIS, Display * display, int screen)
/* 64 seems nice. */ /* 64 seems nice. */
int attribs[64]; int attribs[64];
int i = 0; int i = 0;
/* Setup our GLX attributes according to the gl_config. */ /* Setup our GLX attributes according to the gl_config. */
attribs[i++] = GLX_RGBA; attribs[i++] = GLX_RGBA;
attribs[i++] = GLX_RED_SIZE; attribs[i++] = GLX_RED_SIZE;
...@@ -395,42 +401,64 @@ X11_GL_CreateContext(_THIS, SDL_Window * window) ...@@ -395,42 +401,64 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
v.visualid = XVisualIDFromVisual(xattr.visual); v.visualid = XVisualIDFromVisual(xattr.visual);
vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n); vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
if (vinfo) { if (vinfo) {
if (_this->gl_config.major_version < 3) { if (_this->gl_config.major_version < 3) {
context = context =
_this->gl_data->glXCreateContext(display, vinfo, NULL, True); _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
} else { } else {
/* If we want a GL 3.0 context or later we need to get a temporary /* If we want a GL 3.0 context or later we need to get a temporary
context to grab the new context creation function */ context to grab the new context creation function */
GLXContext temp_context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True); GLXContext temp_context =
_this->gl_data->glXCreateContext(display, vinfo, NULL, True);
if (!temp_context) { if (!temp_context) {
SDL_SetError("Could not create GL context"); SDL_SetError("Could not create GL context");
return NULL; return NULL;
} else { } else {
int attribs[] = { int attribs[] = {
GLX_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, GLX_CONTEXT_MAJOR_VERSION_ARB,
GLX_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, _this->gl_config.major_version,
0 GLX_CONTEXT_MINOR_VERSION_ARB,
_this->gl_config.minor_version,
0
}; };
/* Get a pointer to the context creation function for GL 3.0 */ /* Get a pointer to the context creation function for GL 3.0 */
PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = (PFNGLXCREATECONTEXTATTRIBSARBPROC)_this->gl_data->glXGetProcAddress((GLubyte*)"glXCreateContextAttribsARB"); PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs =
(PFNGLXCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
glXGetProcAddress((GLubyte *)
"glXCreateContextAttribsARB");
if (!glXCreateContextAttribs) { if (!glXCreateContextAttribs) {
SDL_SetError("GL 3.x is not supported"); SDL_SetError("GL 3.x is not supported");
context = temp_context; context = temp_context;
} else { } else {
/* Create a GL 3.x context */ /* Create a GL 3.x context */
GLXFBConfig *framebuffer_config = NULL; GLXFBConfig *framebuffer_config = NULL;
int fbcount = 0; int fbcount = 0;
GLXFBConfig* (*glXChooseFBConfig)(Display* disp, int screen, const int* attrib_list, int* nelements); GLXFBConfig *(*glXChooseFBConfig) (Display * disp,
int screen,
glXChooseFBConfig = (GLXFBConfig* (*)(Display*, int, const int*, int*))_this->gl_data->glXGetProcAddress((GLubyte*)"glXChooseFBConfig"); const int *attrib_list,
int *nelements);
if (!glXChooseFBConfig || !(framebuffer_config = glXChooseFBConfig(display, DefaultScreen(display), NULL, &fbcount))) {
SDL_SetError("No good framebuffers found. GL 3.x disabled"); glXChooseFBConfig =
(GLXFBConfig *
(*)(Display *, int, const int *,
int *)) _this->gl_data->
glXGetProcAddress((GLubyte *) "glXChooseFBConfig");
if (!glXChooseFBConfig
|| !(framebuffer_config =
glXChooseFBConfig(display,
DefaultScreen(display), NULL,
&fbcount))) {
SDL_SetError
("No good framebuffers found. GL 3.x disabled");
context = temp_context; context = temp_context;
} else { } else {
context = glXCreateContextAttribs(display, framebuffer_config[0], NULL, True, attribs); context =
_this->gl_data->glXDestroyContext(display, temp_context); glXCreateContextAttribs(display,
framebuffer_config[0],
NULL, True, attribs);
_this->gl_data->glXDestroyContext(display,
temp_context);
} }
} }
} }
......
test/testdyngles.c
View file @ 483f2ba3
...@@ -118,10 +118,10 @@ main(int argc, char *argv[]) ...@@ -118,10 +118,10 @@ main(int argc, char *argv[])
/* you may want to change these according to the platform */ /* you may want to change these according to the platform */
video_w = 320; video_w = 320;
video_h = 480; video_h = 480;
#ifdef __QNXNTO__ #ifdef __QNXNTO__
video_h = 640; video_h = 640;
video_w = 480; video_w = 480;
#endif /* __QNXNTO__ */ #endif /* __QNXNTO__ */
if (argv[1]) { if (argv[1]) {
gl_library = argv[1]; gl_library = argv[1];
...@@ -153,11 +153,11 @@ main(int argc, char *argv[]) ...@@ -153,11 +153,11 @@ main(int argc, char *argv[])
pixels[3 * i + 2] = rand() % 250 - 125; pixels[3 * i + 2] = rand() % 250 - 125;
} }
#ifdef __QNXNTO__ #ifdef __QNXNTO__
f.glViewport(0, 0, video_h, video_w); f.glViewport(0, 0, video_h, video_w);
#else #else
f.glViewport(0, 0, video_w, video_h); f.glViewport(0, 0, video_w, video_h);
#endif /* __QNXNTO__ */ #endif /* __QNXNTO__ */
f.glMatrixMode(GL_PROJECTION); f.glMatrixMode(GL_PROJECTION);
f.glLoadIdentity(); f.glLoadIdentity();
......
test/testgl2.c
View file @ 483f2ba3
...@@ -242,51 +242,54 @@ main(int argc, char *argv[]) ...@@ -242,51 +242,54 @@ main(int argc, char *argv[])
printf("Extensions : %s\n", glGetString(GL_EXTENSIONS)); printf("Extensions : %s\n", glGetString(GL_EXTENSIONS));
printf("\n"); printf("\n");
status=SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
printf("Failed to get SDL_GL_RED_SIZE: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_RED_SIZE: %s\n", SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
printf("Failed to get SDL_GL_GREEN_SIZE: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_GREEN_SIZE: %s\n", SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
printf("Failed to get SDL_GL_BLUE_SIZE: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_BLUE_SIZE: %s\n", SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value); printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value);
} else { } else {
printf("Failed to get SDL_GL_DEPTH_SIZE: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_DEPTH_SIZE: %s\n", SDL_GetError());
} }
if (fsaa) { if (fsaa) {
status=SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value); status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value);
if (!status) { if (!status) {
printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value); printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
} else { } else {
printf("Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value); status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value);
if (!status) { if (!status) {
printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, value); printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
value);
} else { } else {
printf("Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
SDL_GetError());
} }
} }
if (accel) { if (accel) {
status=SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value); status = SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value);
if (!status) if (!status) {
{
printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value); printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value);
} else { } else {
printf("Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n", SDL_GetError()); printf("Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
SDL_GetError());
} }
} }
......
test/testgles.c
View file @ 483f2ba3
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "SDL_opengles.h" #include "SDL_opengles.h"
static CommonState *state; static CommonState *state;
static SDL_GLContext *context=NULL; static SDL_GLContext *context = NULL;
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
static void static void
...@@ -22,10 +22,8 @@ quit(int rc) ...@@ -22,10 +22,8 @@ quit(int rc)
{ {
int i; int i;
if (context!=NULL) if (context != NULL) {
{ for (i = 0; i < state->num_windows; i++) {
for (i=0; i<state->num_windows; i++)
{
if (context[i]) { if (context[i]) {
SDL_GL_DeleteContext(context[i]); SDL_GL_DeleteContext(context[i]);
} }
...@@ -149,16 +147,14 @@ main(int argc, char *argv[]) ...@@ -149,16 +147,14 @@ main(int argc, char *argv[])
quit(2); quit(2);
} }
context=SDL_calloc(state->num_windows, sizeof(SDL_GLContext)); context = SDL_calloc(state->num_windows, sizeof(SDL_GLContext));
if (context==NULL) if (context == NULL) {
{ fprintf(stderr, "Out of memory!\n");
fprintf(stderr, "Out of memory!\n"); quit(2);
quit(2);
} }
/* Create OpenGL ES contexts */ /* Create OpenGL ES contexts */
for (i=0; i<state->num_windows; i++) for (i = 0; i < state->num_windows; i++) {
{
context[i] = SDL_GL_CreateContext(state->windows[i]); context[i] = SDL_GL_CreateContext(state->windows[i]);
if (!context[i]) { if (!context[i]) {
fprintf(stderr, "SDL_GL_CreateContext(): %s\n", SDL_GetError()); fprintf(stderr, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
...@@ -181,59 +177,65 @@ main(int argc, char *argv[]) ...@@ -181,59 +177,65 @@ main(int argc, char *argv[])
printf("Extensions : %s\n", glGetString(GL_EXTENSIONS)); printf("Extensions : %s\n", glGetString(GL_EXTENSIONS));
printf("\n"); printf("\n");
status=SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_RED_SIZE: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_RED_SIZE: %s\n",
SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_GREEN_SIZE: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_GREEN_SIZE: %s\n",
SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value); printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_BLUE_SIZE: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_BLUE_SIZE: %s\n",
SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value); status = SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value);
if (!status) { if (!status) {
printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value); printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_DEPTH_SIZE: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_DEPTH_SIZE: %s\n",
SDL_GetError());
} }
if (fsaa) { if (fsaa) {
status=SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value); status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value);
if (!status) { if (!status) {
printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value); printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
SDL_GetError());
} }
status=SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value); status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value);
if (!status) { if (!status) {
printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, value); printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
SDL_GetError());
} }
} }
if (accel) { if (accel) {
status=SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value); status = SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value);
if (!status) if (!status) {
{
printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value); printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value);
} else { } else {
fprintf(stderr, "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n", SDL_GetError()); fprintf(stderr, "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
SDL_GetError());
} }
} }
/* Set rendering settings for each context */ /* Set rendering settings for each context */
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
status=SDL_GL_MakeCurrent(state->windows[i], context[i]); status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) if (status) {
{
printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
/* Continue for next window */ /* Continue for next window */
...@@ -262,13 +264,12 @@ main(int argc, char *argv[]) ...@@ -262,13 +264,12 @@ main(int argc, char *argv[])
} }
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
int w, h; int w, h;
status=SDL_GL_MakeCurrent(state->windows[i], context[i]); status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) if (status) {
{ printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
/* Continue for next window */ /* Continue for next window */
continue; continue;
} }
SDL_GetWindowSize(state->windows[i], &w, &h); SDL_GetWindowSize(state->windows[i], &w, &h);
glViewport(0, 0, w, h); glViewport(0, 0, w, h);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment