More work for 1.3
authorPatrice Mandin <patmandin@gmail.com>
Wed, 20 Sep 2006 21:29:44 +0000
changeset 2033b657f0bc72c2
parent 2032 ddf89133aebc
child 2034 59e1a50193aa
More work for 1.3
src/video/ataricommon/SDL_ataridevmouse_c.h
src/video/ataricommon/SDL_atarigl.c
src/video/ataricommon/SDL_atarigl_c.h
src/video/ataricommon/SDL_biosevents.c
src/video/ataricommon/SDL_gemdosevents.c
src/video/ataricommon/SDL_xbiosevents_c.h
     1.1 --- a/src/video/ataricommon/SDL_ataridevmouse_c.h	Wed Sep 20 21:22:08 2006 +0000
     1.2 +++ b/src/video/ataricommon/SDL_ataridevmouse_c.h	Wed Sep 20 21:29:44 2006 +0000
     1.3 @@ -32,9 +32,6 @@
     1.4  
     1.5  #include "../SDL_sysvideo.h"
     1.6  
     1.7 -/* Hidden "this" pointer for the video functions */
     1.8 -#define _THIS	SDL_VideoDevice *this
     1.9 -
    1.10  extern int SDL_AtariDevMouse_Open(void);
    1.11  extern void SDL_AtariDevMouse_Close(void);
    1.12  extern void SDL_AtariDevMouse_PostMouseEvents(_THIS, SDL_bool buttonEvents);
     2.1 --- a/src/video/ataricommon/SDL_atarigl.c	Wed Sep 20 21:22:08 2006 +0000
     2.2 +++ b/src/video/ataricommon/SDL_atarigl.c	Wed Sep 20 21:29:44 2006 +0000
     2.3 @@ -80,9 +80,9 @@
     2.4  {
     2.5  #if SDL_VIDEO_OPENGL
     2.6      if (gl_oldmesa) {
     2.7 -        gl_active = InitOld(this, current);
     2.8 +        gl_active = InitOld(_this, current);
     2.9      } else {
    2.10 -        gl_active = InitNew(this, current);
    2.11 +        gl_active = InitNew(_this, current);
    2.12      }
    2.13  #endif
    2.14  
    2.15 @@ -95,8 +95,8 @@
    2.16  #if SDL_VIDEO_OPENGL
    2.17      if (gl_oldmesa) {
    2.18          /* Old mesa implementations */
    2.19 -        if (this->gl_data->OSMesaDestroyLDG) {
    2.20 -            this->gl_data->OSMesaDestroyLDG();
    2.21 +        if (_this->gl_data->OSMesaDestroyLDG) {
    2.22 +            _this->gl_data->OSMesaDestroyLDG();
    2.23          }
    2.24          if (gl_shadow) {
    2.25              Mfree(gl_shadow);
    2.26 @@ -105,15 +105,15 @@
    2.27      } else {
    2.28          /* New mesa implementation */
    2.29          if (gl_ctx) {
    2.30 -            if (this->gl_data->OSMesaDestroyContext) {
    2.31 -                this->gl_data->OSMesaDestroyContext(gl_ctx);
    2.32 +            if (_this->gl_data->OSMesaDestroyContext) {
    2.33 +                _this->gl_data->OSMesaDestroyContext(gl_ctx);
    2.34              }
    2.35              gl_ctx = NULL;
    2.36          }
    2.37      }
    2.38  
    2.39      if (unload) {
    2.40 -        SDL_AtariGL_UnloadLibrary(this);
    2.41 +        SDL_AtariGL_UnloadLibrary(_this);
    2.42      }
    2.43  #endif /* SDL_VIDEO_OPENGL */
    2.44      gl_active = 0;
    2.45 @@ -134,7 +134,7 @@
    2.46      }
    2.47  
    2.48      /* Unload previous driver */
    2.49 -    SDL_AtariGL_UnloadLibrary(this);
    2.50 +    SDL_AtariGL_UnloadLibrary(_this);
    2.51  
    2.52      /* Load library given by path */
    2.53      handle = SDL_LoadObject(path);
    2.54 @@ -167,17 +167,17 @@
    2.55          return -1;
    2.56      }
    2.57  
    2.58 -    this->gl_data->glGetIntegerv = SDL_LoadFunction(handle, "glGetIntegerv");
    2.59 -    this->gl_data->glFinish = SDL_LoadFunction(handle, "glFinish");
    2.60 -    this->gl_data->glFlush = SDL_LoadFunction(handle, "glFlush");
    2.61 +    _this->gl_data->glGetIntegerv = SDL_LoadFunction(handle, "glGetIntegerv");
    2.62 +    _this->gl_data->glFinish = SDL_LoadFunction(handle, "glFinish");
    2.63 +    _this->gl_data->glFlush = SDL_LoadFunction(handle, "glFlush");
    2.64  
    2.65      cancel_load = SDL_FALSE;
    2.66 -    if (this->gl_data->glGetIntegerv == NULL) {
    2.67 +    if (_this->gl_data->glGetIntegerv == NULL) {
    2.68          cancel_load = SDL_TRUE;
    2.69      } else {
    2.70          /* We need either glFinish (OSMesa) or glFlush (TinyGL) */
    2.71 -        if ((this->gl_data->glFinish == NULL) &&
    2.72 -            (this->gl_data->glFlush == NULL)) {
    2.73 +        if ((_this->gl_data->glFinish == NULL) &&
    2.74 +            (_this->gl_data->glFlush == NULL)) {
    2.75              cancel_load = SDL_TRUE;
    2.76          }
    2.77      }
    2.78 @@ -190,53 +190,53 @@
    2.79      }
    2.80  
    2.81      /* Load functions pointers (osmesa.ldg) */
    2.82 -    this->gl_data->OSMesaCreateContextExt =
    2.83 +    _this->gl_data->OSMesaCreateContextExt =
    2.84          SDL_LoadFunction(handle, "OSMesaCreateContextExt");
    2.85 -    this->gl_data->OSMesaDestroyContext =
    2.86 +    _this->gl_data->OSMesaDestroyContext =
    2.87          SDL_LoadFunction(handle, "OSMesaDestroyContext");
    2.88 -    this->gl_data->OSMesaMakeCurrent =
    2.89 +    _this->gl_data->OSMesaMakeCurrent =
    2.90          SDL_LoadFunction(handle, "OSMesaMakeCurrent");
    2.91 -    this->gl_data->OSMesaPixelStore =
    2.92 +    _this->gl_data->OSMesaPixelStore =
    2.93          SDL_LoadFunction(handle, "OSMesaPixelStore");
    2.94 -    this->gl_data->OSMesaGetProcAddress =
    2.95 +    _this->gl_data->OSMesaGetProcAddress =
    2.96          SDL_LoadFunction(handle, "OSMesaGetProcAddress");
    2.97  
    2.98      /* Load old functions pointers (mesa_gl.ldg, tiny_gl.ldg) */
    2.99 -    this->gl_data->OSMesaCreateLDG =
   2.100 +    _this->gl_data->OSMesaCreateLDG =
   2.101          SDL_LoadFunction(handle, "OSMesaCreateLDG");
   2.102 -    this->gl_data->OSMesaDestroyLDG =
   2.103 +    _this->gl_data->OSMesaDestroyLDG =
   2.104          SDL_LoadFunction(handle, "OSMesaDestroyLDG");
   2.105  
   2.106      gl_oldmesa = 0;
   2.107  
   2.108 -    if ((this->gl_data->OSMesaCreateContextExt == NULL) ||
   2.109 -        (this->gl_data->OSMesaDestroyContext == NULL) ||
   2.110 -        (this->gl_data->OSMesaMakeCurrent == NULL) ||
   2.111 -        (this->gl_data->OSMesaPixelStore == NULL) ||
   2.112 -        (this->gl_data->OSMesaGetProcAddress == NULL)) {
   2.113 +    if ((_this->gl_data->OSMesaCreateContextExt == NULL) ||
   2.114 +        (_this->gl_data->OSMesaDestroyContext == NULL) ||
   2.115 +        (_this->gl_data->OSMesaMakeCurrent == NULL) ||
   2.116 +        (_this->gl_data->OSMesaPixelStore == NULL) ||
   2.117 +        (_this->gl_data->OSMesaGetProcAddress == NULL)) {
   2.118          /* Hum, maybe old library ? */
   2.119 -        if ((this->gl_data->OSMesaCreateLDG == NULL) ||
   2.120 -            (this->gl_data->OSMesaDestroyLDG == NULL)) {
   2.121 +        if ((_this->gl_data->OSMesaCreateLDG == NULL) ||
   2.122 +            (_this->gl_data->OSMesaDestroyLDG == NULL)) {
   2.123              SDL_SetError("Could not retrieve OSMesa functions");
   2.124              SDL_UnloadObject(handle);
   2.125              /* Restore pointers to static library */
   2.126 -            SDL_AtariGL_InitPointers(this);
   2.127 +            SDL_AtariGL_InitPointers(_this);
   2.128              return -1;
   2.129          } else {
   2.130              gl_oldmesa = 1;
   2.131          }
   2.132      }
   2.133  
   2.134 -    this->gl_config.dll_handle = handle;
   2.135 +    _this->gl_config.dll_handle = handle;
   2.136      if (path) {
   2.137 -        SDL_strlcpy(this->gl_config.driver_path, path,
   2.138 -                    SDL_arraysize(this->gl_config.driver_path));
   2.139 +        SDL_strlcpy(_this->gl_config.driver_path, path,
   2.140 +                    SDL_arraysize(_this->gl_config.driver_path));
   2.141      } else {
   2.142          *this->gl_config.driver_path = '\0';
   2.143      }
   2.144  
   2.145  #endif
   2.146 -    this->gl_config.driver_loaded = 1;
   2.147 +    _this->gl_config.driver_loaded = 1;
   2.148  
   2.149      return 0;
   2.150  #else
   2.151 @@ -250,10 +250,10 @@
   2.152      void *func = NULL;
   2.153  #if SDL_VIDEO_OPENGL
   2.154  
   2.155 -    if (this->gl_config.dll_handle) {
   2.156 +    if (_this->gl_config.dll_handle) {
   2.157          func = SDL_LoadFunction(this->gl_config.dll_handle, (void *) proc);
   2.158 -    } else if (this->gl_data->OSMesaGetProcAddress) {
   2.159 -        func = this->gl_data->OSMesaGetProcAddress(proc);
   2.160 +    } else if (_this->gl_data->OSMesaGetProcAddress) {
   2.161 +        func = _this->gl_data->OSMesaGetProcAddress(proc);
   2.162      }
   2.163  #endif
   2.164      return func;
   2.165 @@ -284,7 +284,7 @@
   2.166          mesa_attrib = GL_ALPHA_BITS;
   2.167          break;
   2.168      case SDL_GL_DOUBLEBUFFER:
   2.169 -        surface = this->screen;
   2.170 +        surface = _this->screen;
   2.171          *value = ((surface->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF);
   2.172          return 0;
   2.173      case SDL_GL_DEPTH_SIZE:
   2.174 @@ -309,7 +309,7 @@
   2.175          return -1;
   2.176      }
   2.177  
   2.178 -    this->gl_data->glGetIntegerv(mesa_attrib, value);
   2.179 +    _this->gl_data->glGetIntegerv(mesa_attrib, value);
   2.180      return 0;
   2.181  #else
   2.182      return -1;
   2.183 @@ -327,9 +327,9 @@
   2.184          return 0;
   2.185      }
   2.186  
   2.187 -    if (this->gl_config.dll_handle) {
   2.188 -        if ((this->gl_data->OSMesaMakeCurrent == NULL) ||
   2.189 -            (this->gl_data->OSMesaPixelStore == NULL)) {
   2.190 +    if (_this->gl_config.dll_handle) {
   2.191 +        if ((_this->gl_data->OSMesaMakeCurrent == NULL) ||
   2.192 +            (_this->gl_data->OSMesaPixelStore == NULL)) {
   2.193              return -1;
   2.194          }
   2.195      }
   2.196 @@ -339,7 +339,7 @@
   2.197          return -1;
   2.198      }
   2.199  
   2.200 -    surface = this->screen;
   2.201 +    surface = _this->screen;
   2.202  
   2.203      if ((surface->format->BitsPerPixel == 15)
   2.204          || (surface->format->BitsPerPixel == 16)) {
   2.205 @@ -349,7 +349,7 @@
   2.206      }
   2.207  
   2.208      if (!
   2.209 -        (this->gl_data->
   2.210 +        (_this->gl_data->
   2.211           OSMesaMakeCurrent(gl_ctx, surface->pixels, type, surface->w,
   2.212                             surface->h))) {
   2.213          SDL_SetError("Can not make OpenGL context current");
   2.214 @@ -357,7 +357,7 @@
   2.215      }
   2.216  
   2.217      /* OSMesa draws upside down */
   2.218 -    this->gl_data->OSMesaPixelStore(OSMESA_Y_UP, 0);
   2.219 +    _this->gl_data->OSMesaPixelStore(OSMESA_Y_UP, 0);
   2.220  
   2.221      return 0;
   2.222  #else
   2.223 @@ -370,17 +370,17 @@
   2.224  {
   2.225  #if SDL_VIDEO_OPENGL
   2.226      if (gl_active) {
   2.227 -        if (this->gl_config.dll_handle) {
   2.228 -            if (this->gl_data->glFinish) {
   2.229 -                this->gl_data->glFinish();
   2.230 -            } else if (this->gl_data->glFlush) {
   2.231 -                this->gl_data->glFlush();
   2.232 +        if (_this->gl_config.dll_handle) {
   2.233 +            if (_this->gl_data->glFinish) {
   2.234 +                _this->gl_data->glFinish();
   2.235 +            } else if (_this->gl_data->glFlush) {
   2.236 +                _this->gl_data->glFlush();
   2.237              }
   2.238          } else {
   2.239 -            this->gl_data->glFinish();
   2.240 +            _this->gl_data->glFinish();
   2.241          }
   2.242 -        gl_copyshadow(this, this->screen);
   2.243 -        gl_convert(this, this->screen);
   2.244 +        gl_copyshadow(_this, _this->screen);
   2.245 +        gl_convert(_this, _this->screen);
   2.246      }
   2.247  #endif
   2.248  }
   2.249 @@ -389,18 +389,18 @@
   2.250  SDL_AtariGL_InitPointers(_THIS)
   2.251  {
   2.252  #if SDL_VIDEO_OPENGL
   2.253 -    this->gl_data->OSMesaCreateContextExt = OSMesaCreateContextExt;
   2.254 -    this->gl_data->OSMesaDestroyContext = OSMesaDestroyContext;
   2.255 -    this->gl_data->OSMesaMakeCurrent = OSMesaMakeCurrent;
   2.256 -    this->gl_data->OSMesaPixelStore = OSMesaPixelStore;
   2.257 -    this->gl_data->OSMesaGetProcAddress = OSMesaGetProcAddress;
   2.258 +    _this->gl_data->OSMesaCreateContextExt = OSMesaCreateContextExt;
   2.259 +    _this->gl_data->OSMesaDestroyContext = OSMesaDestroyContext;
   2.260 +    _this->gl_data->OSMesaMakeCurrent = OSMesaMakeCurrent;
   2.261 +    _this->gl_data->OSMesaPixelStore = OSMesaPixelStore;
   2.262 +    _this->gl_data->OSMesaGetProcAddress = OSMesaGetProcAddress;
   2.263  
   2.264 -    this->gl_data->glGetIntegerv = glGetIntegerv;
   2.265 -    this->gl_data->glFinish = glFinish;
   2.266 -    this->gl_data->glFlush = glFlush;
   2.267 +    _this->gl_data->glGetIntegerv = glGetIntegerv;
   2.268 +    _this->gl_data->glFinish = glFinish;
   2.269 +    _this->gl_data->glFlush = glFlush;
   2.270  
   2.271 -    this->gl_data->OSMesaCreateLDG = NULL;
   2.272 -    this->gl_data->OSMesaDestroyLDG = NULL;
   2.273 +    _this->gl_data->OSMesaCreateLDG = NULL;
   2.274 +    _this->gl_data->OSMesaDestroyLDG = NULL;
   2.275  #endif
   2.276  }
   2.277  
   2.278 @@ -410,12 +410,12 @@
   2.279  SDL_AtariGL_UnloadLibrary(_THIS)
   2.280  {
   2.281  #if SDL_VIDEO_OPENGL
   2.282 -    if (this->gl_config.dll_handle) {
   2.283 -        SDL_UnloadObject(this->gl_config.dll_handle);
   2.284 -        this->gl_config.dll_handle = NULL;
   2.285 +    if (_this->gl_config.dll_handle) {
   2.286 +        SDL_UnloadObject(_this->gl_config.dll_handle);
   2.287 +        _this->gl_config.dll_handle = NULL;
   2.288  
   2.289          /* Restore pointers to static library */
   2.290 -        SDL_AtariGL_InitPointers(this);
   2.291 +        SDL_AtariGL_InitPointers(_this);
   2.292      }
   2.293  #endif
   2.294  }
   2.295 @@ -432,8 +432,8 @@
   2.296      int recreatecontext;
   2.297      GLint newaccumsize;
   2.298  
   2.299 -    if (this->gl_config.dll_handle) {
   2.300 -        if (this->gl_data->OSMesaCreateContextExt == NULL) {
   2.301 +    if (_this->gl_config.dll_handle) {
   2.302 +        if (_this->gl_data->OSMesaCreateContextExt == NULL) {
   2.303              return 0;
   2.304          }
   2.305      }
   2.306 @@ -496,14 +496,14 @@
   2.307  
   2.308      /* Try to keep current context if possible */
   2.309      newaccumsize =
   2.310 -        this->gl_config.accum_red_size +
   2.311 -        this->gl_config.accum_green_size +
   2.312 -        this->gl_config.accum_blue_size + this->gl_config.accum_alpha_size;
   2.313 +        _this->gl_config.accum_red_size +
   2.314 +        _this->gl_config.accum_green_size +
   2.315 +        _this->gl_config.accum_blue_size + _this->gl_config.accum_alpha_size;
   2.316      recreatecontext = 1;
   2.317      if (gl_ctx &&
   2.318          (gl_curformat == osmesa_format) &&
   2.319 -        (gl_curdepth == this->gl_config.depth_size) &&
   2.320 -        (gl_curstencil == this->gl_config.stencil_size) &&
   2.321 +        (gl_curdepth == _this->gl_config.depth_size) &&
   2.322 +        (gl_curstencil == _this->gl_config.stencil_size) &&
   2.323          (gl_curaccum == newaccumsize)) {
   2.324          recreatecontext = 0;
   2.325      }
   2.326 @@ -511,17 +511,17 @@
   2.327          SDL_AtariGL_Quit(this, SDL_FALSE);
   2.328  
   2.329          gl_ctx =
   2.330 -            this->gl_data->OSMesaCreateContextExt(osmesa_format,
   2.331 -                                                  this->gl_config.
   2.332 +            _this->gl_data->OSMesaCreateContextExt(osmesa_format,
   2.333 +                                                  _this->gl_config.
   2.334                                                    depth_size,
   2.335 -                                                  this->gl_config.
   2.336 +                                                  _this->gl_config.
   2.337                                                    stencil_size,
   2.338                                                    newaccumsize, NULL);
   2.339  
   2.340          if (gl_ctx) {
   2.341              gl_curformat = osmesa_format;
   2.342 -            gl_curdepth = this->gl_config.depth_size;
   2.343 -            gl_curstencil = this->gl_config.stencil_size;
   2.344 +            gl_curdepth = _this->gl_config.depth_size;
   2.345 +            gl_curstencil = _this->gl_config.stencil_size;
   2.346              gl_curaccum = newaccumsize;
   2.347          } else {
   2.348              gl_curformat = 0;
   2.349 @@ -543,16 +543,16 @@
   2.350      Uint32 redmask;
   2.351      int recreatecontext, tinygl_present;
   2.352  
   2.353 -    if (this->gl_config.dll_handle) {
   2.354 -        if (this->gl_data->OSMesaCreateLDG == NULL) {
   2.355 +    if (_this->gl_config.dll_handle) {
   2.356 +        if (_this->gl_data->OSMesaCreateLDG == NULL) {
   2.357              return 0;
   2.358          }
   2.359      }
   2.360  
   2.361      /* TinyGL only supports VDI_RGB (OSMESA_RGB) */
   2.362      tinygl_present = 0;
   2.363 -    if (this->gl_config.dll_handle) {
   2.364 -        if (this->gl_data->glFinish == NULL) {
   2.365 +    if (_this->gl_config.dll_handle) {
   2.366 +        if (_this->gl_data->glFinish == NULL) {
   2.367              tinygl_present = 1;
   2.368          }
   2.369      }
   2.370 @@ -658,7 +658,7 @@
   2.371          break;
   2.372      default:
   2.373          if (tinygl_present) {
   2.374 -            SDL_AtariGL_Quit(this, SDL_FALSE);
   2.375 +            SDL_AtariGL_Quit(_this, SDL_FALSE);
   2.376              return 0;
   2.377          }
   2.378          gl_pixelsize = 1;
   2.379 @@ -675,10 +675,10 @@
   2.380          recreatecontext = 0;
   2.381      }
   2.382      if (recreatecontext) {
   2.383 -        SDL_AtariGL_Quit(this, SDL_FALSE);
   2.384 +        SDL_AtariGL_Quit(_this, SDL_FALSE);
   2.385  
   2.386          gl_shadow =
   2.387 -            this->gl_data->OSMesaCreateLDG(osmesa_format, GL_UNSIGNED_BYTE,
   2.388 +            _this->gl_data->OSMesaCreateLDG(osmesa_format, GL_UNSIGNED_BYTE,
   2.389                                             current->w, current->h);
   2.390  
   2.391          if (gl_shadow) {
     3.1 --- a/src/video/ataricommon/SDL_atarigl_c.h	Wed Sep 20 21:22:08 2006 +0000
     3.2 +++ b/src/video/ataricommon/SDL_atarigl_c.h	Wed Sep 20 21:29:44 2006 +0000
     3.3 @@ -32,10 +32,7 @@
     3.4  
     3.5  #include "../SDL_sysvideo.h"
     3.6  
     3.7 -/* Hidden "this" pointer for the video functions */
     3.8 -#define _THIS   SDL_VideoDevice *this
     3.9 -
    3.10 -struct SDL_PrivateGLData
    3.11 +struct SDL_GLDriverData
    3.12  {
    3.13  
    3.14      int gl_active;              /* to stop switching drivers while we have a valid context */
    3.15 @@ -87,20 +84,20 @@
    3.16  };
    3.17  
    3.18  /* Variable names */
    3.19 -#define gl_active		(this->gl_data->gl_active)
    3.20 -#define gl_ctx			(this->gl_data->ctx)
    3.21 -#define gl_oldmesa		(this->gl_data->gl_oldmesa)
    3.22 -#define gl_pixelsize	(this->gl_data->gl_pixelsize)
    3.23 -#define gl_upsidedown	(this->gl_data->gl_upsidedown)
    3.24 -#define gl_shadow		(this->gl_data->gl_shadow)
    3.25 -#define gl_convert		(this->gl_data->ConvertSurface)
    3.26 -#define gl_copyshadow	(this->gl_data->CopyShadow)
    3.27 -#define gl_curformat	(this->gl_data->format)
    3.28 -#define gl_curdepth		(this->gl_data->depth)
    3.29 -#define gl_curstencil	(this->gl_data->stencil)
    3.30 -#define gl_curaccum		(this->gl_data->accum)
    3.31 -#define gl_curwidth		(this->gl_data->width)
    3.32 -#define gl_curheight	(this->gl_data->height)
    3.33 +#define gl_active		(_this->gl_data->gl_active)
    3.34 +#define gl_ctx			(_this->gl_data->ctx)
    3.35 +#define gl_oldmesa		(_this->gl_data->gl_oldmesa)
    3.36 +#define gl_pixelsize	(_this->gl_data->gl_pixelsize)
    3.37 +#define gl_upsidedown	(_this->gl_data->gl_upsidedown)
    3.38 +#define gl_shadow		(_this->gl_data->gl_shadow)
    3.39 +#define gl_convert		(_this->gl_data->ConvertSurface)
    3.40 +#define gl_copyshadow	(_this->gl_data->CopyShadow)
    3.41 +#define gl_curformat	(_this->gl_data->format)
    3.42 +#define gl_curdepth		(_this->gl_data->depth)
    3.43 +#define gl_curstencil	(_this->gl_data->stencil)
    3.44 +#define gl_curaccum		(_this->gl_data->accum)
    3.45 +#define gl_curwidth		(_this->gl_data->width)
    3.46 +#define gl_curheight	(_this->gl_data->height)
    3.47  
    3.48  /* OpenGL functions */
    3.49  extern int SDL_AtariGL_Init(_THIS, SDL_Surface * current);
     4.1 --- a/src/video/ataricommon/SDL_biosevents.c	Wed Sep 20 21:22:08 2006 +0000
     4.2 +++ b/src/video/ataricommon/SDL_biosevents.c	Wed Sep 20 21:29:44 2006 +0000
     4.3 @@ -99,9 +99,9 @@
     4.4      }
     4.5  
     4.6      if (use_dev_mouse) {
     4.7 -        SDL_AtariDevMouse_PostMouseEvents(this, SDL_TRUE);
     4.8 +        SDL_AtariDevMouse_PostMouseEvents(_this, SDL_TRUE);
     4.9      } else {
    4.10 -        SDL_AtariXbios_PostMouseEvents(this, SDL_TRUE);
    4.11 +        SDL_AtariXbios_PostMouseEvents(_this, SDL_TRUE);
    4.12      }
    4.13  
    4.14      /* Will be previous table */
    4.15 @@ -116,7 +116,6 @@
    4.16  	{	\
    4.17  		if (special_keys_state & (1<<(numbit))) { \
    4.18  			bios_currentkeyboard[scancode]=0xFF; \
    4.19 -			bios_currentascii[scancode]=0; \
    4.20  		}	\
    4.21  	}
    4.22  
     5.1 --- a/src/video/ataricommon/SDL_gemdosevents.c	Wed Sep 20 21:22:08 2006 +0000
     5.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c	Wed Sep 20 21:29:44 2006 +0000
     5.3 @@ -106,9 +106,9 @@
     5.4      }
     5.5  
     5.6      if (use_dev_mouse) {
     5.7 -        SDL_AtariDevMouse_PostMouseEvents(this, SDL_TRUE);
     5.8 +        SDL_AtariDevMouse_PostMouseEvents(_this, SDL_TRUE);
     5.9      } else {
    5.10 -        SDL_AtariXbios_PostMouseEvents(this, SDL_TRUE);
    5.11 +        SDL_AtariXbios_PostMouseEvents(_this, SDL_TRUE);
    5.12      }
    5.13  
    5.14      /* Will be previous table */
    5.15 @@ -123,7 +123,6 @@
    5.16  	{	\
    5.17  		if (special_keys_state & (1<<(numbit))) { \
    5.18  			gemdos_currentkeyboard[scancode]=0xFF; \
    5.19 -			gemdos_currentascii[scancode]=0; \
    5.20  		}	\
    5.21  	}
    5.22  
     6.1 --- a/src/video/ataricommon/SDL_xbiosevents_c.h	Wed Sep 20 21:22:08 2006 +0000
     6.2 +++ b/src/video/ataricommon/SDL_xbiosevents_c.h	Wed Sep 20 21:29:44 2006 +0000
     6.3 @@ -32,9 +32,6 @@
     6.4  
     6.5  #include "../SDL_sysvideo.h"
     6.6  
     6.7 -/* Hidden "this" pointer for the video functions */
     6.8 -#define _THIS	SDL_VideoDevice *this
     6.9 -
    6.10  #define ATARI_XBIOS_MOUSEEVENTS (1<<0)
    6.11  #define ATARI_XBIOS_JOYSTICKEVENTS (1<<1)
    6.12