view src/video/photon/SDL_ph_video.h @ 1748:5e86e34453d4

------- Comment #1 From Max Horn 2006-04-17 03:08 [reply] ------- Created an attachment (id=106) [edit] Patch for src/joystick/win32/SDL_mmjoystick.c I am not even a Windows user, so take the following with a grain of salt: SDL_mmjoystick.c has a function GetJoystickName which obtains the joystick name by looking at the registry. The way it does that seems very fishy to me. Namely, it uses the parameter "index" to construct a registry value name (BTW, those variables used in the code are really badly named). The value of "index" in turn equals the current value of "numdevs", as called from SDL_SYS_JoystickInit. I read through the MSDN docs at <http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dnarinput/html/msdn_extdirect.asp>, and I believe the simple fix is to replace line 183 of said file SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey); by the following: SYS_JoystickName[numdevs] = GetJoystickName(SYS_JoystickID[i], joycaps.szRegKey); However, that is only *hiding* the real issue. Problem is, the list of joysticks as returned by windows may contains "gaps", and the code deals incorrectly with that. Namely those gaps occur if joysticks are removed/(re)added, as the reporter observed. The attached patch fixes this and another (off-by-one) issue in the code. But since I have no Windows machine, I can't even test-compile it, so use with caution.
author Sam Lantinga <slouken@libsdl.org>
date Sat, 29 Apr 2006 20:22:31 +0000
parents 141528317f4f
children 782fd950bd46 a1b03ba2fcd0
line wrap: on
line source

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken@libsdl.org
*/
#include "SDL_config.h"

#ifndef __SDL_PH_VIDEO_H__
#define __SDL_PH_VIDEO_H__

#include "SDL_mouse.h"
#include "../SDL_sysvideo.h"

#include <sys/neutrino.h>

#include <Ph.h>
#include <Pt.h>
#include <photon/Pg.h>
#include <photon/PdDirect.h>

#if SDL_VIDEO_OPENGL
    #if (_NTO_VERSION < 630)
        #include <photon/PdGL.h>
    #else
        #include <GL/qnxgl.h>
        #include <GL/GLPh.h>
    #endif /* 6.3.0 */
#endif /* SDL_VIDEO_OPENGL */

/* Hidden "this" pointer for the video functions */
#define _THIS	SDL_VideoDevice* this

#define PH_OGL_MAX_ATTRIBS 32

#define SDLPH_PAL_NONE    0x00000000L
#define SDLPH_PAL_EMULATE 0x00000001L
#define SDLPH_PAL_SYSTEM  0x00000002L

typedef struct
{
    unsigned char* Y;
    unsigned char* V;
    unsigned char* U;
} FRAMEDATA;

/* Mask values for SDL_ReallocFormat() */
struct ColourMasks
{
    Uint32 red;
    Uint32 green;
    Uint32 blue;
    Uint32 alpha;
    Uint32 bpp;
};

/* Private display data */
struct SDL_PrivateVideoData
{
    PgDisplaySettings_t mode_settings;	
    PtWidget_t *Window;                  /* used to handle input events */
    PhImage_t *image;	                 /* used to display image       */
#if SDL_VIDEO_OPENGL
    #if (_NTO_VERSION < 630)
        PdOpenGLContext_t* OGLContext;   /* OpenGL context              */
        void* OGLBuffers;                /* OpenGL buffers (unused)     */
    #else
        qnxglc_t* OGLContext;            /* OpenGL context for the 6.3  */
        qnxgl_bufs_t* OGLBuffers;        /* OpenGL buffers for the 6.3  */
    #endif /* 630 */

    Uint32 OGLFlags;                     /* OpenGL flags                */
    Uint32 OGLBPP;                       /* OpenGL bpp                  */
#endif /* SDL_VIDEO_OPENGL */
    PgColor_t savedpal[_Pg_MAX_PALETTE];
    PgColor_t syspalph[_Pg_MAX_PALETTE];

    struct
    {
        PdDirectContext_t*    direct_context;
        PdOffscreenContext_t* offscreen_context;
        PdOffscreenContext_t* offscreen_backcontext;
        PhDrawContext_t*      oldDC;
        uint8_t*              dc_ptr;
        unsigned char*        CurrentFrameData;
        unsigned char*        FrameData0;
        unsigned char*        FrameData1;
        Uint32                current;
        Uint32                flags;
    } ocimage;

    PgHWCaps_t graphics_card_caps;  /* Graphics card caps at the moment of start   */
    PgVideoModeInfo_t desktop_mode; /* Current desktop video mode information      */
    int old_video_mode;             /* Stored mode before fullscreen switch        */
    int old_refresh_rate;           /* Stored refresh rate befor fullscreen switch */

    int mouse_relative;
    WMcursor* BlankCursor;
    uint32_t videomode_emulatemode;

    Uint32 visualbpp;	            /* current visual bpp                          */
    Uint32 desktopbpp;              /* bpp of desktop at the moment of start       */
    Uint32 desktoppal;              /* palette mode emulation or system            */

    int currently_fullscreen;
    int currently_hided;            /* 1 - window hided (minimazed), 0 - normal    */
    int currently_maximized;        /* 1 - window hided (minimazed), 0 - normal    */

    PhEvent_t* event;
    SDL_Overlay* overlay;
};

#define mode_settings         (this->hidden->mode_settings)
#define window	              (this->hidden->Window)
#define SDL_Image             (this->hidden->image)
#define OCImage               (this->hidden->ocimage)
#define old_video_mode        (this->hidden->old_video_mode)
#define old_refresh_rate      (this->hidden->old_refresh_rate)
#define graphics_card_caps    (this->hidden->graphics_card_caps)
#define desktopbpp            (this->hidden->desktopbpp)
#define visualbpp             (this->hidden->visualbpp)
#define desktoppal            (this->hidden->desktoppal)
#define savedpal              (this->hidden->savedpal)
#define syspalph              (this->hidden->syspalph)
#define currently_fullscreen  (this->hidden->currently_fullscreen)
#define currently_hided       (this->hidden->currently_hided)
#define currently_maximized   (this->hidden->currently_maximized)
#define phevent               (this->hidden->event)
#define current_overlay       (this->hidden->overlay)
#define desktop_mode          (this->hidden->desktop_mode)
#define mouse_relative        (this->hidden->mouse_relative)
#define SDL_BlankCursor       (this->hidden->BlankCursor)
#define videomode_emulatemode (this->hidden->videomode_emulatemode)

#if SDL_VIDEO_OPENGL
     #define oglctx               (this->hidden->OGLContext)
     #define oglbuffers           (this->hidden->OGLBuffers)
     #define oglflags             (this->hidden->OGLFlags)
     #define oglbpp               (this->hidden->OGLBPP)
#endif /* SDL_VIDEO_OPENGL */

#endif /* __SDL_PH_VIDEO_H__ */