More work for 1.3

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402097

src/video/ataricommon/SDL_ataridevmouse_c.h

@@ -32,9 +32,6 @@
 
 #include "../SDL_sysvideo.h"
 
-/* Hidden "this" pointer for the video functions */
-#define _THIS	SDL_VideoDevice *this
-
 extern int SDL_AtariDevMouse_Open(void);
 extern void SDL_AtariDevMouse_Close(void);
 extern void SDL_AtariDevMouse_PostMouseEvents(_THIS, SDL_bool buttonEvents);

src/video/ataricommon/SDL_atarigl_c.h

@@ -32,10 +32,7 @@
 
 #include "../SDL_sysvideo.h"
 
-/* Hidden "this" pointer for the video functions */
-#define _THIS   SDL_VideoDevice *this
-
-struct SDL_PrivateGLData
+struct SDL_GLDriverData
 {
 
     int gl_active;              /* to stop switching drivers while we have a valid context */
@@ -87,20 +84,20 @@ struct SDL_PrivateGLData
 };
 
 /* Variable names */
-#define gl_active		(this->gl_data->gl_active)
-#define gl_ctx			(this->gl_data->ctx)
-#define gl_oldmesa		(this->gl_data->gl_oldmesa)
-#define gl_pixelsize	(this->gl_data->gl_pixelsize)
-#define gl_upsidedown	(this->gl_data->gl_upsidedown)
-#define gl_shadow		(this->gl_data->gl_shadow)
-#define gl_convert		(this->gl_data->ConvertSurface)
-#define gl_copyshadow	(this->gl_data->CopyShadow)
-#define gl_curformat	(this->gl_data->format)
-#define gl_curdepth		(this->gl_data->depth)
-#define gl_curstencil	(this->gl_data->stencil)
-#define gl_curaccum		(this->gl_data->accum)
-#define gl_curwidth		(this->gl_data->width)
-#define gl_curheight	(this->gl_data->height)
+#define gl_active		(_this->gl_data->gl_active)
+#define gl_ctx			(_this->gl_data->ctx)
+#define gl_oldmesa		(_this->gl_data->gl_oldmesa)
+#define gl_pixelsize	(_this->gl_data->gl_pixelsize)
+#define gl_upsidedown	(_this->gl_data->gl_upsidedown)
+#define gl_shadow		(_this->gl_data->gl_shadow)
+#define gl_convert		(_this->gl_data->ConvertSurface)
+#define gl_copyshadow	(_this->gl_data->CopyShadow)
+#define gl_curformat	(_this->gl_data->format)
+#define gl_curdepth		(_this->gl_data->depth)
+#define gl_curstencil	(_this->gl_data->stencil)
+#define gl_curaccum		(_this->gl_data->accum)
+#define gl_curwidth		(_this->gl_data->width)
+#define gl_curheight	(_this->gl_data->height)
 
 /* OpenGL functions */
 extern int SDL_AtariGL_Init(_THIS, SDL_Surface * current);

src/video/ataricommon/SDL_biosevents.c

@@ -99,9 +99,9 @@ AtariBios_PumpEvents(_THIS)
     }
 
     if (use_dev_mouse) {
-        SDL_AtariDevMouse_PostMouseEvents(this, SDL_TRUE);
+        SDL_AtariDevMouse_PostMouseEvents(_this, SDL_TRUE);
     } else {
-        SDL_AtariXbios_PostMouseEvents(this, SDL_TRUE);
+        SDL_AtariXbios_PostMouseEvents(_this, SDL_TRUE);
     }
 
     /* Will be previous table */
@@ -116,7 +116,6 @@ UpdateSpecialKeys(int special_keys_state)
 	{	\
 		if (special_keys_state & (1<<(numbit))) { \
 			bios_currentkeyboard[scancode]=0xFF; \
-			bios_currentascii[scancode]=0; \
 		}	\
 	}
 

src/video/ataricommon/SDL_gemdosevents.c

@@ -106,9 +106,9 @@ AtariGemdos_PumpEvents(_THIS)
     }
 
     if (use_dev_mouse) {
-        SDL_AtariDevMouse_PostMouseEvents(this, SDL_TRUE);
+        SDL_AtariDevMouse_PostMouseEvents(_this, SDL_TRUE);
     } else {
-        SDL_AtariXbios_PostMouseEvents(this, SDL_TRUE);
+        SDL_AtariXbios_PostMouseEvents(_this, SDL_TRUE);
     }
 
     /* Will be previous table */
@@ -123,7 +123,6 @@ UpdateSpecialKeys(int special_keys_state)
 	{	\
 		if (special_keys_state & (1<<(numbit))) { \
 			gemdos_currentkeyboard[scancode]=0xFF; \
-			gemdos_currentascii[scancode]=0; \
 		}	\
 	}
 

src/video/ataricommon/SDL_xbiosevents_c.h

@@ -32,9 +32,6 @@
 
 #include "../SDL_sysvideo.h"
 
-/* Hidden "this" pointer for the video functions */
-#define _THIS	SDL_VideoDevice *this
-
 #define ATARI_XBIOS_MOUSEEVENTS (1<<0)
 #define ATARI_XBIOS_JOYSTICKEVENTS (1<<1)