--- a/README	Wed Jan 26 19:20:16 2011 -0800
+++ b/README	Thu Jan 27 00:06:36 2011 -0800
@@ -3,7 +3,7 @@
 
                                   (SDL)
 
-                                Version 1.2
+                                Version 1.3
 
 ---
 http://www.libsdl.org/
@@ -12,10 +12,9 @@
 level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
 and 2D framebuffer across multiple platforms.
 
-The current version supports Linux, Windows, Windows CE, BeOS, MacOS,
-Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.
-The code contains support for AIX, OSF/Tru64, RISC OS, and SymbianOS,
-but these are not officially supported.
+The current version supports Windows, Windows CE, Mac OS X, Linux, FreeBSD,
+NetBSD, OpenBSD, BSD/OS, Solaris, QNX, iOS, and Android. The code contains
+support for other operating systems but those are not officially supported.
 
 SDL is written in C, but works with C++ natively, and has bindings to
 several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,

--- a/README.RISCOS	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-Readme for RISC OS port of SDL
-==============================
-
-This document last updated on 2nd Februrary 2006
-
-This is a RISC OS port of the Simple Direct Media Layer (SDL) by Alan Buckley with contributions from Peter Naulls.
-
-Details of the SDL can be found at http://www.libsdl.org.
-
-The source code including the RISC OS version can be obtained from:
-
-http://www.libsdl.org.
-
-Pre built libraries and many games and applications compiled for RISC OS using this library can be downloaded from The Unix Porting Project at http://www.riscos.info/unix/.
-
-This is released under the LGPL see the file COPYING for details.
-
-
-Compiling applications under RISC OS
-====================================
-
-Add -ISDL: for the C compiler flags if you include the files in the SDL directory. e.g. #include "SDL/SDL.h"
-Add -ISDL:SDL for the C compiler flags if you include the files directly. e.g. #include "SDL/SDL.h"
-
-Add -LSDL: -lSDL to the link stage of compilation.
-
-For example, to compile the testbitmap.c sample you could use:
-
-gcc -ISDL:SDL -LSDL: -lSDL testbitmap.c -otestbitmap
-
-
-RISC OS port of SDL runtime information
-=======================================
-
-Runtime requirements
---------------------
-
-This library currently needs a minimum of RISC OS 3.6. The source code for the library (and a lot of the programs built with it) also need long file names.
-
-To use the audio you also need 16 bit sound and to have installed the DigitalRender module by Andreas Dehmel version 0.51 available from his
-web site: http://home.t-online.de/~zarquon
-This is loaded when needed by UnixLib.
-
-Note: As most programs ported from other OSes use high resolution graphics and a memory back buffer a machine with a StrongARM processor and 1 or 2MB of VRAM (or a better machine) is recomended.
-
-
-RISC OS runtime parameters
---------------------------
-
-Several environmental variables have been defined to make porting programs easier (i.e. By setting these variable you do not need to have source code differences between OSes).
-
-They are all defined on an application basis.
-
-The <appname> used below is found as follows:
-1. Use the name of the program unless it is !RunImage
-2. Check the folder specification for the folder !RunImage is run from. If it is a folder name use that name, otherwise if it is an environmental variable of the form <XXX$Dir> use the value of XXX.
-
-The variables are:
-
-SDL$<appname>$TaskName
-
-The name of the task for RISC OS. If omitted then <appname> is used for the task name,
-
-SDL$<appname>$BackBuffer
-
-Set to 1 to use a system memory back buffer for the screen in full screen mode. Some programs on other systems assume their is always a back buffer even though the SDL specification specifies this is not the case. The current RISC OS implementation uses direct writes to the screen if a hardware fullscreen is requested.
-
-Set to 2 to use an ARM code full word copy. This is faster than the standard back buffer, but uses aligned words only so it is possible (but unlikely) for it to corrupt the screen for 8bpp and 16bpp modes.
-
-Set to 3 to use a RISC OS sprite as the back buffer. This is usually the slowest for most SDL applications, however it may be useful in the future as Sprite acceleration is added to various hardware that runs RISC OS.
-
-SDL$<appname>$CloseAction - set the action for the close icon. Again as programs don't match the specification you can set this to 0 to remove the close icon from the main window for applications where this does not affect the program.
-
-
-RISC OS SDL port API notes
-==========================
-
-Current level of implementation
--------------------------------
-
-The following list is an overview of how much of the SDL is implemented. The areas match the main areas of the SDL.
-
-video - Mostly done. Doesn't cover gamma, YUV-overlay or OpenGL.
-Window Manager - Mostly done. SetIcon/IconifyWindow not implemented.
-Events - Mostly done. Resize and some joystick events missing.
-Joystick - Currently assumes a single joystick with 4 buttons.
-Audio - Done
-Threads - Done
-Timers - Done
-
-Thread support can be removed by defining DISABLE_THREADS and recompiling the library.
-
-SDL API notes
--------------
-
-This section contains additional notes on some specific commands.
-
-SDL_SetVideoMode
-  On RISC OS a fullscreen mode directly accesses the screen. This can be modified by the environmental variable (SDL$<appname>$BackBuffer) or by using the SDL_SWSURFACE flag to write to an offscreen buffer that is updated using SDL_UpdateRects.
-  Open GL is not supported so SDL_OPENGL and SDL_OPENGLBLIT flags fail.
-  SDL_RESIZEABLE and SDL_NOFRAME flags are not supported.
-
-SDL_SetColors
-  In a wimp mode the screen colours are not changed for a hardware palette instead the RISC OS sprite colour mapping is used to get the best matching colours.
-
-SDL_CreateCursor
-   Inverted colour is not supported.
-
-SDL_WM_ToggleFullScreen
-   Currently this won't work if the application starts up in Fullscreen mode.
-   Toggling to fullscreen will only work if the monitor is set up to support the exact screen size requested.
-
-SDL_EnableUNICODE
-   Unicode translation used here is only really accurate for 7 bit characters.
-
-SDL_NumJoysticks/JoystickName etc.
-   Hardcoded to expect only 1 joystick with 4 buttons if the Joystick module is loaded.
-
-SDL_GetTicks
-   Timer used has only a centisecond accuracy. This applies to other time related functions.
-   
-SDL_Delay
-   Modified to poll keyboard/mouse during the delay on the event thread.
-
-
-Notes on current implementation
--------------------------------
-
-Keyboard and mouse are polled so if too long a time is spent between a call to SDL_PumpEvents, functions that use it, or SDL_Delay events can be missed.

--- a/configure.in	Wed Jan 26 19:20:16 2011 -0800
+++ b/configure.in	Thu Jan 27 00:06:36 2011 -0800
@@ -2668,32 +2668,6 @@
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
         fi
         ;;
-    *-riscos)
-        ARCH=riscos
-        CheckOSS
-        CheckPTHREAD
-        # Set up files for the video library
-        if test x$enable_video = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS)
-            SOURCES="$SOURCES $srcdir/src/video/riscos/*.c"
-            SOURCES="$SOURCES $srcdir/src/video/riscos/*.S"
-            have_video=yes
-        fi
-        # Set up files for the joystick library
-        if test x$enable_joystick = xyes; then
-            AC_DEFINE(SDL_JOYSTICK_RISCOS)
-            SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c"
-            have_joystick=yes
-        fi
-        # Set up files for the timer library
-        if test x$enable_timers = xyes; then
-            AC_DEFINE(SDL_TIMER_RISCOS)
-            SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
-            have_timers=yes
-        fi
-        # The RISC OS platform requires special setup.
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ljpeg -ltiff -lpng -lz"
-        ;;
     *)
         AC_MSG_ERROR([
 *** Unsupported host:  Please add to configure.in

--- a/include/SDL_config.h.in	Wed Jan 26 19:20:16 2011 -0800
+++ b/include/SDL_config.h.in	Thu Jan 27 00:06:36 2011 -0800
@@ -221,7 +221,6 @@
 #undef SDL_JOYSTICK_IOKIT
 #undef SDL_JOYSTICK_LINUX
 #undef SDL_JOYSTICK_NDS
-#undef SDL_JOYSTICK_RISCOS
 #undef SDL_JOYSTICK_WINMM
 #undef SDL_JOYSTICK_USBHID
 #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
@@ -251,7 +250,6 @@
 #undef SDL_TIMER_BEOS
 #undef SDL_TIMER_DUMMY
 #undef SDL_TIMER_NDS
-#undef SDL_TIMER_RISCOS
 #undef SDL_TIMER_UNIX
 #undef SDL_TIMER_WINDOWS
 #undef SDL_TIMER_WINCE
@@ -265,7 +263,6 @@
 #undef SDL_VIDEO_DRIVER_NDS
 #undef SDL_VIDEO_DRIVER_PHOTON
 #undef SDL_VIDEO_DRIVER_QNXGF
-#undef SDL_VIDEO_DRIVER_RISCOS
 #undef SDL_VIDEO_DRIVER_WINDOWS
 #undef SDL_VIDEO_DRIVER_X11
 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC

--- a/src/joystick/riscos/SDL_sysjoystick.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_RISCOS
-
-/*
-   RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003
-
-   Note: Currently assumes joystick is present if joystick module is loaded
-   and that there is one joystick with four buttons.
-*/
-
-/* This is the system specific header for the SDL joystick API */
-
-#include "SDL_events.h"
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-#include "kernel.h"
-
-#define JOYSTICK_READ 0x43F40
-
-struct joystick_hwdata
-{
-    int joystate;
-};
-
-
-/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks.  Joystick 0 should be the system default joystick.
- * It should return number of joysticks, or -1 on an unrecoverable fatal error.
- */
-int
-SDL_SYS_JoystickInit(void)
-{
-    _kernel_swi_regs regs;
-
-    /* Try to read joystick 0 */
-    regs.r[0] = 0;
-    if (_kernel_swi(JOYSTICK_READ, &regs, &regs) == NULL) {
-        /* Switch works so assume we've got a joystick */
-        return 1;
-    }
-    /* Switch fails so it looks like there's no joystick here */
-
-    return (0);
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *
-SDL_SYS_JoystickName(int index)
-{
-    if (index == 0) {
-        return "RISC OS Joystick 0";
-    }
-
-    SDL_SetError("No joystick available with that index");
-    return (NULL);
-}
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-int
-SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
-{
-    _kernel_swi_regs regs;
-
-    if (!(joystick->hwdata = SDL_malloc(sizeof(struct joystick_hwdata))))
-        return -1;
-
-    regs.r[0] = joystick->index;
-
-    /* Don't know how to get exact count of buttons so assume max of 4 for now */
-    joystick->nbuttons = 4;
-
-    joystick->nhats = 0;
-    joystick->nballs = 0;
-    joystick->naxes = 2;
-    joystick->hwdata->joystate = 0;
-
-    return 0;
-
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void
-SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = joystick->index;
-
-    if (_kernel_swi(JOYSTICK_READ, &regs, &regs) == NULL) {
-        int newstate = regs.r[0];
-        int oldstate = joystick->hwdata->joystate;
-        if (newstate != oldstate) {
-            if ((newstate & 0xFF) != (oldstate & 0xFF)) {
-                int y = regs.r[0] & 0xFF;
-                /* Convert to signed values */
-                if (y >= 128)
-                    y -= 256;
-                SDL_PrivateJoystickAxis(joystick, 1, -y * 256); /* Up and down opposite to result in SDL */
-            }
-            if ((newstate & 0xFF00) != (oldstate & 0xFF00)) {
-                int x = (regs.r[0] & 0xFF00) >> 8;
-                if (x >= 128)
-                    x -= 256;
-                SDL_PrivateJoystickAxis(joystick, 0, x * 256);
-            }
-
-            if ((newstate & 0xFF0000) != (oldstate & 0xFF0000)) {
-                int buttons = (regs.r[0] & 0xFF0000) >> 16;
-                int oldbuttons = (oldstate & 0xFF0000) >> 16;
-                int i;
-                for (i = 0; i < joystick->nbuttons; i++) {
-                    if ((buttons & (1 << i)) != (oldbuttons & (1 << i))) {
-                        if (buttons & (1 << i))
-                            SDL_PrivateJoystickButton(joystick, i,
-                                                      SDL_PRESSED);
-                        else
-                            SDL_PrivateJoystickButton(joystick, i,
-                                                      SDL_RELEASED);
-                    }
-                }
-            }
-            joystick->hwdata->joystate = newstate;
-        }
-    }
-
-    return;
-}
-
-/* Function to close a joystick after use */
-void
-SDL_SYS_JoystickClose(SDL_Joystick * joystick)
-{
-    if (joystick->hwdata)
-        SDL_free(joystick->hwdata);
-    return;
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void
-SDL_SYS_JoystickQuit(void)
-{
-    SDL_numjoysticks = 0;
-
-    return;
-}
-
-#endif /* SDL_JOYSTICK_RISCOS */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/pthread/SDL_systhread.c	Wed Jan 26 19:20:16 2011 -0800
+++ b/src/thread/pthread/SDL_systhread.c	Thu Jan 27 00:06:36 2011 -0800
@@ -34,14 +34,6 @@
     SIGVTALRM, SIGPROF, 0
 };
 
-#ifdef __RISCOS__
-/* RISC OS needs to know the main thread for
- * it's timer and event processing. */
-int riscos_using_threads = 0;
-SDL_threadID riscos_main_thread = 0;  /* Thread running events */
-#endif
-
-
 static void *
 RunThread(void *data)
 {
@@ -67,12 +59,6 @@
         SDL_SetError("Not enough resources to create thread");
         return (-1);
     }
-#ifdef __RISCOS__
-    if (riscos_using_threads == 0) {
-        riscos_using_threads = 1;
-        riscos_main_thread = SDL_ThreadID();
-    }
-#endif
 
     return (0);
 }

--- a/src/thread/riscos/SDL_syscond.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* RISC OS implementations uses pthreads based on linux code */
-
-#if SDL_THREADS_DISABLED
-#include "../generic/SDL_syscond.c"
-#else
-#include <sys/time.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#include "SDL_thread.h"
-#include "SDL_sysmutex_c.h"
-
-struct SDL_cond
-{
-    pthread_cond_t cond;
-};
-
-/* Create a condition variable */
-SDL_cond *
-SDL_CreateCond(void)
-{
-    SDL_cond *cond;
-
-    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
-    if (cond) {
-        if (pthread_cond_init(&cond->cond, NULL) < 0) {
-            SDL_SetError("pthread_cond_init() failed");
-            SDL_free(cond);
-            cond = NULL;
-        }
-    }
-    return (cond);
-}
-
-/* Destroy a condition variable */
-void
-SDL_DestroyCond(SDL_cond * cond)
-{
-    if (cond) {
-        pthread_cond_destroy(&cond->cond);
-        SDL_free(cond);
-    }
-}
-
-/* Restart one of the threads that are waiting on the condition variable */
-int
-SDL_CondSignal(SDL_cond * cond)
-{
-    int retval;
-
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    retval = 0;
-    if (pthread_cond_signal(&cond->cond) != 0) {
-        SDL_SetError("pthread_cond_signal() failed");
-        retval = -1;
-    }
-    return retval;
-}
-
-/* Restart all threads that are waiting on the condition variable */
-int
-SDL_CondBroadcast(SDL_cond * cond)
-{
-    int retval;
-
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    retval = 0;
-    if (pthread_cond_broadcast(&cond->cond) != 0) {
-        SDL_SetError("pthread_cond_broadcast() failed");
-        retval = -1;
-    }
-    return retval;
-}
-
-int
-SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
-{
-    int retval;
-    struct timeval delta;
-    struct timespec abstime;
-
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    gettimeofday(&delta, NULL);
-
-    abstime.tv_sec = delta.tv_sec + (ms / 1000);
-    abstime.tv_nsec = (delta.tv_usec + (ms % 1000) * 1000) * 1000;
-    if (abstime.tv_nsec > 1000000000) {
-        abstime.tv_sec += 1;
-        abstime.tv_nsec -= 1000000000;
-    }
-
-  tryagain:
-    retval = pthread_cond_timedwait(&cond->cond, &mutex->id, &abstime);
-    switch (retval) {
-    case EINTR:
-        goto tryagain;
-        break;
-    case ETIMEDOUT:
-        retval = SDL_MUTEX_TIMEDOUT;
-        break;
-    case 0:
-        break;
-    default:
-        SDL_SetError("pthread_cond_timedwait() failed");
-        retval = -1;
-        break;
-    }
-    return retval;
-}
-
-/* Wait on the condition variable, unlocking the provided mutex.
-   The mutex must be locked before entering this function!
- */
-int
-SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
-{
-    int retval;
-
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    retval = 0;
-    if (pthread_cond_wait(&cond->cond, &mutex->id) != 0) {
-        SDL_SetError("pthread_cond_wait() failed");
-        retval = -1;
-    }
-    return retval;
-}
-#endif
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/riscos/SDL_sysmutex.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* RISC OS implementations uses pthreads based on linux code */
-
-#include "SDL_thread.h"
-
-#if SDL_THREADS_DISABLED
-#include "../generic/SDL_sysmutex.c"
-#else
-
-#include <pthread.h>
-
-struct SDL_mutex
-{
-    pthread_mutex_t id;
-#if SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX
-    int recursive;
-    pthread_t owner;
-#endif
-};
-
-SDL_mutex *
-SDL_CreateMutex(void)
-{
-    SDL_mutex *mutex;
-    pthread_mutexattr_t attr;
-
-    /* Allocate the structure */
-    mutex = (SDL_mutex *) SDL_calloc(1, sizeof(*mutex));
-    if (mutex) {
-        pthread_mutexattr_init(&attr);
-#if SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX
-        /* No extra attributes necessary */
-#else
-        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-#endif /* SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX */
-        if (pthread_mutex_init(&mutex->id, &attr) != 0) {
-            SDL_SetError("pthread_mutex_init() failed");
-            SDL_free(mutex);
-            mutex = NULL;
-        }
-    } else {
-        SDL_OutOfMemory();
-    }
-    return (mutex);
-}
-
-void
-SDL_DestroyMutex(SDL_mutex * mutex)
-{
-    if (mutex) {
-        pthread_mutex_destroy(&mutex->id);
-        SDL_free(mutex);
-    }
-}
-
-/* Lock the mutex */
-int
-SDL_mutexP(SDL_mutex * mutex)
-{
-    int retval;
-#if SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX
-    pthread_t this_thread;
-#endif
-
-    if (mutex == NULL) {
-        SDL_SetError("Passed a NULL mutex");
-        return -1;
-    }
-
-    retval = 0;
-#if SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX
-    this_thread = pthread_self();
-    if (mutex->owner == this_thread) {
-        ++mutex->recursive;
-    } else {
-        /* The order of operations is important.
-           We set the locking thread id after we obtain the lock
-           so unlocks from other threads will fail.
-         */
-        if (pthread_mutex_lock(&mutex->id) == 0) {
-            mutex->owner = this_thread;
-            mutex->recursive = 0;
-        } else {
-            SDL_SetError("pthread_mutex_lock() failed");
-            retval = -1;
-        }
-    }
-#else
-    if (pthread_mutex_lock(&mutex->id) < 0) {
-        SDL_SetError("pthread_mutex_lock() failed");
-        retval = -1;
-    }
-#endif
-    return retval;
-}
-
-int
-SDL_mutexV(SDL_mutex * mutex)
-{
-    int retval;
-
-    if (mutex == NULL) {
-        SDL_SetError("Passed a NULL mutex");
-        return -1;
-    }
-
-    retval = 0;
-#if SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX
-    /* We can only unlock the mutex if we own it */
-    if (pthread_self() == mutex->owner) {
-        if (mutex->recursive) {
-            --mutex->recursive;
-        } else {
-            /* The order of operations is important.
-               First reset the owner so another thread doesn't lock
-               the mutex and set the ownership before we reset it,
-               then release the lock semaphore.
-             */
-            mutex->owner = 0;
-            pthread_mutex_unlock(&mutex->id);
-        }
-    } else {
-        SDL_SetError("mutex not owned by this thread");
-        retval = -1;
-    }
-
-#else
-    if (pthread_mutex_unlock(&mutex->id) < 0) {
-        SDL_SetError("pthread_mutex_unlock() failed");
-        retval = -1;
-    }
-#endif /* SDL_THREAD_PTHREAD_NO_RECURSIVE_MUTEX */
-
-    return retval;
-}
-#endif
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/riscos/SDL_sysmutex_c.h	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifndef _SDL_mutex_c_h
-#define _SDL_mutex_c_h
-
-#if !SDL_THREADS_DISABLED
-struct SDL_mutex
-{
-    pthread_mutex_t id;
-};
-#endif
-
-
-#endif /* _SDL_mutex_c_h */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/riscos/SDL_syssem.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* RISC OS semiphores based on linux code */
-
-
-#include "SDL_timer.h"
-#include "SDL_thread.h"
-#include "SDL_systhread_c.h"
-
-#if !SDL_THREADS_DISABLED
-
-SDL_sem *
-SDL_CreateSemaphore(Uint32 initial_value)
-{
-    SDL_SetError("SDL not configured with thread support");
-    return (SDL_sem *) 0;
-}
-
-void
-SDL_DestroySemaphore(SDL_sem * sem)
-{
-    return;
-}
-
-int
-SDL_SemTryWait(SDL_sem * sem)
-{
-    SDL_SetError("SDL not configured with thread support");
-    return -1;
-}
-
-int
-SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
-{
-    SDL_SetError("SDL not configured with thread support");
-    return -1;
-}
-
-int
-SDL_SemWait(SDL_sem * sem)
-{
-    SDL_SetError("SDL not configured with thread support");
-    return -1;
-}
-
-Uint32
-SDL_SemValue(SDL_sem * sem)
-{
-    return 0;
-}
-
-int
-SDL_SemPost(SDL_sem * sem)
-{
-    SDL_SetError("SDL not configured with thread support");
-    return -1;
-}
-
-#else
-
-
-#include <unistd.h>             /* For getpid() */
-#include <pthread.h>
-#include <semaphore.h>
-
-struct SDL_semaphore
-{
-    sem_t *sem;
-    sem_t sem_data;
-};
-
-/* Create a semaphore, initialized with value */
-SDL_sem *
-SDL_CreateSemaphore(Uint32 initial_value)
-{
-    SDL_sem *sem = (SDL_sem *) SDL_malloc(sizeof(SDL_sem));
-    if (sem) {
-        if (sem_init(&sem->sem_data, 0, initial_value) < 0) {
-            SDL_SetError("sem_init() failed");
-            SDL_free(sem);
-            sem = NULL;
-        } else {
-            sem->sem = &sem->sem_data;
-        }
-    } else {
-        SDL_OutOfMemory();
-    }
-    return sem;
-}
-
-void
-SDL_DestroySemaphore(SDL_sem * sem)
-{
-    if (sem) {
-        sem_destroy(sem->sem);
-        SDL_free(sem);
-    }
-}
-
-int
-SDL_SemTryWait(SDL_sem * sem)
-{
-    int retval;
-
-    if (!sem) {
-        SDL_SetError("Passed a NULL semaphore");
-        return -1;
-    }
-    retval = SDL_MUTEX_TIMEDOUT;
-    if (sem_trywait(sem->sem) == 0) {
-        retval = 0;
-    }
-    return retval;
-}
-
-int
-SDL_SemWait(SDL_sem * sem)
-{
-    int retval;
-
-    if (!sem) {
-        SDL_SetError("Passed a NULL semaphore");
-        return -1;
-    }
-
-    retval = sem_wait(sem->sem);
-    if (retval < 0) {
-        SDL_SetError("sem_wait() failed");
-    }
-    return retval;
-}
-
-int
-SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
-{
-    int retval;
-
-    if (!sem) {
-        SDL_SetError("Passed a NULL semaphore");
-        return -1;
-    }
-
-    /* Try the easy cases first */
-    if (timeout == 0) {
-        return SDL_SemTryWait(sem);
-    }
-    if (timeout == SDL_MUTEX_MAXWAIT) {
-        return SDL_SemWait(sem);
-    }
-
-    /* Ack!  We have to busy wait... */
-    timeout += SDL_GetTicks();
-    do {
-        retval = SDL_SemTryWait(sem);
-        if (retval == 0) {
-            break;
-        }
-        SDL_Delay(1);
-    } while (SDL_GetTicks() < timeout);
-
-    return retval;
-}
-
-Uint32
-SDL_SemValue(SDL_sem * sem)
-{
-    int ret = 0;
-    if (sem) {
-        sem_getvalue(sem->sem, &ret);
-        if (ret < 0) {
-            ret = 0;
-        }
-    }
-    return (Uint32) ret;
-}
-
-int
-SDL_SemPost(SDL_sem * sem)
-{
-    int retval;
-
-    if (!sem) {
-        SDL_SetError("Passed a NULL semaphore");
-        return -1;
-    }
-
-    retval = sem_post(sem->sem);
-    if (retval < 0) {
-        SDL_SetError("sem_post() failed");
-    }
-    return retval;
-}
-
-#endif /* !SDL_THREADS_DISABLED */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/riscos/SDL_systhread.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* RISC OS version based on pthreads linux source */
-
-#include "SDL_thread.h"
-#include "../SDL_systhread.h"
-
-#if SDL_THREADS_DISABLED
-
-int
-SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
-{
-    SDL_SetError
-        ("Threads have not been compiled into this version of the library");
-    return (-1);
-}
-
-void
-SDL_SYS_SetupThread(void)
-{
-    return;
-}
-
-SDL_threadID
-SDL_ThreadID(void)
-{
-    return (0);
-}
-
-void
-SDL_SYS_WaitThread(SDL_Thread * thread)
-{
-    return;
-}
-
-#else
-
-#include <signal.h>
-
-/* List of signals to mask in the subthreads */
-static int sig_list[] = {
-    SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
-    SIGVTALRM, SIGPROF, 0
-};
-
-#include <pthread.h>
-
-int riscos_using_threads = 0;
-Uint32 riscos_main_thread = 0;  /* Thread running events */
-
-static void *
-RunThread(void *data)
-{
-    SDL_RunThread(data);
-    pthread_exit((void *) 0);
-    return ((void *) 0);        /* Prevent compiler warning */
-}
-
-int
-SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
-{
-    pthread_attr_t type;
-
-    /* Set the thread attributes */
-    if (pthread_attr_init(&type) != 0) {
-        SDL_SetError("Couldn't initialize pthread attributes");
-        return (-1);
-    }
-    pthread_attr_setdetachstate(&type, PTHREAD_CREATE_JOINABLE);
-
-    /* Create the thread and go! */
-    if (pthread_create(&thread->handle, &type, RunThread, args) != 0) {
-        SDL_SetError("Not enough resources to create thread");
-        return (-1);
-    }
-
-    if (riscos_using_threads == 0) {
-        riscos_using_threads = 1;
-        riscos_main_thread = SDL_ThreadID();
-    }
-
-    return (0);
-}
-
-void
-SDL_SYS_SetupThread(void)
-{
-    int i;
-    sigset_t mask;
-
-    /* Mask asynchronous signals for this thread */
-    sigemptyset(&mask);
-    for (i = 0; sig_list[i]; ++i) {
-        sigaddset(&mask, sig_list[i]);
-    }
-    pthread_sigmask(SIG_BLOCK, &mask, 0);
-
-#ifdef PTHREAD_CANCEL_ASYNCHRONOUS
-    /* Allow ourselves to be asynchronously cancelled */
-    {
-        int oldstate;
-        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate);
-    }
-#endif
-}
-
-Uint32
-SDL_ThreadID(void)
-{
-    return ((Uint32) pthread_self());
-}
-
-void
-SDL_SYS_WaitThread(SDL_Thread * thread)
-{
-    pthread_join(thread->handle, 0);
-}
-
-#endif
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/thread/riscos/SDL_systhread_c.h	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#if SDL_THREADS_DISABLED
-
-typedef int SYS_ThreadHandle;
-
-#else
-
-#include <pthread.h>
-
-typedef pthread_t SYS_ThreadHandle;
-
-#endif
-
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/timer/riscos/SDL_systimer.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_TIMER_RISCOS
-
-#include <stdio.h>
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include "SDL_timer.h"
-#include "../SDL_timer_c.h"
-
-#if SDL_THREADS_DISABLED
-/* Timer  SDL_arraysize(Timer ),start/reset time */
-static Uint32 timerStart;
-/* Timer running function */
-void RISCOS_CheckTimer();
-#else
-#include <pthread.h>
-extern SDL_threadID riscos_main_thread;
-extern int riscos_using_threads;
-extern SDL_threadID SDL_ThreadID();
-extern SDL_threadID SDL_EventThreadID(void);
-#endif
-
-
-extern void RISCOS_BackgroundTasks(void);
-
-/* The first ticks value of the application */
-clock_t start;
-
-void
-SDL_StartTicks(void)
-{
-    /* Set first ticks value */
-    start = clock();
-}
-
-Uint32
-SDL_GetTicks(void)
-{
-    clock_t ticks;
-
-    ticks = clock() - start;
-
-
-#if CLOCKS_PER_SEC == 1000
-
-    return (ticks);
-
-#elif CLOCKS_PER_SEC == 100
-
-    return (ticks * 10);
-
-#else
-
-    return ticks * (1000 / CLOCKS_PER_SEC);
-
-#endif
-
-}
-
-void
-SDL_Delay(Uint32 ms)
-{
-    Uint32 now, then, elapsed;
-#if !SDL_THREADS_DISABLED
-    int is_event_thread;
-    if (riscos_using_threads) {
-        is_event_thread = 0;
-        if (SDL_EventThreadID()) {
-            if (SDL_EventThreadID() == SDL_ThreadID())
-                is_event_thread = 1;
-        } else if (SDL_ThreadID() == riscos_main_thread)
-            is_event_thread = 1;
-    } else
-        is_event_thread = 1;
-#endif
-
-    /*TODO: Next version of Unixlib may allow us to use usleep here */
-    /*      for non event threads */
-
-    /* Set the timeout interval - Linux only needs to do this once */
-    then = SDL_GetTicks();
-
-    do {
-        /* Do background tasks required while sleeping as we are not multithreaded */
-#if SDL_THREADS_DISABLED
-        RISCOS_BackgroundTasks();
-#else
-        /* For threaded build only run background tasks in event thread */
-        if (is_event_thread)
-            RISCOS_BackgroundTasks();
-#endif
-
-        /* Calculate the time interval left (in case of interrupt) */
-        now = SDL_GetTicks();
-        elapsed = (now - then);
-        then = now;
-        if (elapsed >= ms) {
-            break;
-        }
-        ms -= elapsed;
-#if !SDL_THREADS_DISABLED
-        /* Need to yield to let other threads have a go */
-        if (riscos_using_threads)
-            pthread_yield();
-#endif
-
-    } while (1);
-}
-
-#if SDL_THREADS_DISABLED
-
-/* Non-threaded version of timer */
-
-int
-SDL_SYS_TimerInit(void)
-{
-    return (0);
-}
-
-void
-SDL_SYS_TimerQuit(void)
-{
-    SDL_SetTimer(0, NULL);
-}
-
-int
-SDL_SYS_StartTimer(void)
-{
-    timerStart = SDL_GetTicks();
-
-    return (0);
-}
-
-void
-SDL_SYS_StopTimer(void)
-{
-    /* Don't need to do anything as we use SDL_timer_running
-       to detect if we need to check the timer */
-}
-
-
-void
-RISCOS_CheckTimer()
-{
-    if (SDL_timer_running
-        && SDL_GetTicks() - timerStart >= SDL_alarm_interval) {
-        Uint32 ms;
-
-        ms = SDL_alarm_callback(SDL_alarm_interval);
-        if (ms != SDL_alarm_interval) {
-            if (ms) {
-                SDL_alarm_interval = ROUND_RESOLUTION(ms);
-            } else {
-                SDL_alarm_interval = 0;
-                SDL_timer_running = 0;
-            }
-        }
-        if (SDL_alarm_interval)
-            timerStart = SDL_GetTicks();
-    }
-}
-
-#else
-
-/* Threaded version of timer - based on code for linux */
-
-#include "SDL_thread.h"
-
-/* Data to handle a single periodic alarm */
-static int timer_alive = 0;
-static SDL_Thread *timer = NULL;
-
-static int
-RunTimer(void *unused)
-{
-    while (timer_alive) {
-        if (SDL_timer_running) {
-            SDL_ThreadedTimerCheck();
-        }
-        SDL_Delay(1);
-    }
-    return (0);
-}
-
-/* This is only called if the event thread is not running */
-int
-SDL_SYS_TimerInit(void)
-{
-    timer_alive = 1;
-    timer = SDL_CreateThread(RunTimer, NULL);
-    if (timer == NULL)
-        return (-1);
-    return (SDL_SetTimerThreaded(1));
-}
-
-void
-SDL_SYS_TimerQuit(void)
-{
-    timer_alive = 0;
-    if (timer) {
-        SDL_WaitThread(timer, NULL);
-        timer = NULL;
-    }
-}
-
-int
-SDL_SYS_StartTimer(void)
-{
-    SDL_SetError("Internal logic error: RISC OS uses threaded timer");
-    return (-1);
-}
-
-void
-SDL_SYS_StopTimer(void)
-{
-    return;
-}
-
-#endif /* SDL_THREADS_DISABLED */
-
-#endif /* SDL_TIMER_RISCOS */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/SDL_sysvideo.h	Wed Jan 26 19:20:16 2011 -0800
+++ b/src/video/SDL_sysvideo.h	Thu Jan 27 00:06:36 2011 -0800
@@ -426,9 +426,6 @@
 #if SDL_VIDEO_DRIVER_EPOC
 extern VideoBootStrap EPOC_bootstrap;
 #endif
-#if SDL_VIDEO_DRIVER_RISCOS
-extern VideoBootStrap RISCOS_bootstrap;
-#endif
 #if SDL_VIDEO_DRIVER_UIKIT
 extern VideoBootStrap UIKIT_bootstrap;
 #endif

--- a/src/video/SDL_video.c	Wed Jan 26 19:20:16 2011 -0800
+++ b/src/video/SDL_video.c	Thu Jan 27 00:06:36 2011 -0800
@@ -80,9 +80,6 @@
 #if SDL_VIDEO_DRIVER_EPOC
     &EPOC_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_RISCOS
-    &RISCOS_bootstrap,
-#endif
 #if SDL_VIDEO_DRIVER_NDS
     &NDS_bootstrap,
 #endif

--- a/src/video/riscos/SDL_riscosASM.S	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-;
-;    SDL - Simple DirectMedia Layer
-;    Copyright (C) 1997-2009 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
-;
-; Assembler routines for RISC OS display
-;
-
-	AREA |C$$CODE|
-
-	EXPORT |RISCOS_Put32|
-
-; Display 32bpp to 32bpp, 1:1
-;
-; Code provided by Adrain Lees
-;
-; entry a1 -> destination
-;       a2 =  dest width in pixels
-;       a3 =  dest line length in bytes
-;       a4 =  dest height in scanlines
-;       arg5 -> source
-;       arg6 =  byte offset from end of source line to start of next
-
-Arg5    *       10*4
-Arg6    *       Arg5+4
-
-RISCOS_Put32    ROUT
-                STMFD   sp!,{a2,v1-v6,sl,fp,lr}
-                LDR     ip,[sp,#Arg5]
-                MOV     lr,a1
-                B       ucp64lp
-
-00              ;tail strip of 1-15 pixels
-
-                LDR     v1,[ip],#4
-01              SUBS    a2,a2,#1
-                STR     v1,[lr],#4
-                LDRHI   v1,[ip],#4
-                BHI     %01
-                B       %02
-
-ucp64end        ADDS    a2,a2,#16
-                BNE     %00
-
-02              SUBS    a4,a4,#1                ;height--
-                LDRHI   v1,[sp,#Arg6]
-                LDRHI   a2,[sp]                 ;reload width
-                BLS     %03
-
-                ;move to start of next scanline
-
-                ADD     lr,a1,a3
-                ADD     a1,a1,a3
-                ADD     ip,ip,v1
-
-ucp64lp         SUBS    a2,a2,#16
-                BLO     ucp64end
-
-                PLD     [ip,#64]
-
-                LDR     v1,[ip],#4
-                LDR     v2,[ip],#4
-                LDR     v3,[ip],#4
-                LDR     v4,[ip],#4
-                LDR     v5,[ip],#4
-                LDR     v6,[ip],#4
-                LDR     sl,[ip],#4
-                LDR     fp,[ip],#4
-                STR     v1,[lr],#4
-                STR     v2,[lr],#4
-                STR     v3,[lr],#4
-                STR     v4,[lr],#4
-                STR     v5,[lr],#4
-                STR     v6,[lr],#4
-                STR     sl,[lr],#4
-                STR     fp,[lr],#4
-
-                PLD     [ip,#64]
-
-                LDR     v1,[ip],#4
-                LDR     v2,[ip],#4
-                LDR     v3,[ip],#4
-                LDR     v4,[ip],#4
-                LDR     v5,[ip],#4
-                LDR     v6,[ip],#4
-                LDR     sl,[ip],#4
-                LDR     fp,[ip],#4
-                STR     v1,[lr],#4
-                STR     v2,[lr],#4
-                STR     v3,[lr],#4
-                STR     v4,[lr],#4
-                STR     v5,[lr],#4
-                STR     v6,[lr],#4
-                STR     sl,[lr],#4
-                STR     fp,[lr],#4
-
-                B       ucp64lp
-
-03              LDMFD   sp!,{a2,v1-v6,sl,fp,pc}
-

--- a/src/video/riscos/SDL_riscosFullScreenVideo.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,802 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-     File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
-	 27 March 2003
-
-     Implements RISC OS full screen display.
-*/
-
-#include "SDL_video.h"
-#include "SDL_mouse.h"
-#include "../SDL_sysvideo.h"
-#include "../SDL_pixels_c.h"
-#include "../../events/SDL_events_c.h"
-
-#include "SDL_riscostask.h"
-#include "SDL_riscosvideo.h"
-#include "SDL_riscosevents_c.h"
-#include "SDL_riscosmouse_c.h"
-
-#include "kernel.h"
-#include "swis.h"
-#include "unixlib/os.h"
-#include "unixlib/local.h"
-
-/* Private structures */
-typedef struct tagScreenModeBlock
-{
-    int flags;                  // mode selector flags, bit 0 = 1, bit 1-7 format specifier, 8-31 reserved
-    int x_pixels;
-    int y_pixels;
-    int pixel_depth;            // 2^pixel_depth = bpp,i.e. 0 = 1, 1 = 2, 4 = 16, 5 = 32
-    int frame_rate;             // -1 use first match
-    int mode_vars[5];           // array of index, value pairs terminated by -1
-} SCREENMODEBLOCK;
-
-
-/* Helper functions */
-void FULLSCREEN_SetDeviceMode(_THIS);
-int FULLSCREEN_SetMode(int width, int height, int bpp);
-void FULLSCREEN_SetupBanks(_THIS);
-
-/* SDL video device functions for fullscreen mode */
-static int FULLSCREEN_SetColors(_THIS, int firstcolor, int ncolors,
-                                SDL_Color * colors);
-static int FULLSCREEN_FlipHWSurface(_THIS, SDL_Surface * surface);
-void FULLSCREEN_SetWMCaption(_THIS, const char *title, const char *icon);
-extern int RISCOS_GetWmInfo(_THIS, SDL_SysWMinfo * info);
-
-/* UpdateRects variants */
-static void FULLSCREEN_UpdateRects(_THIS, int numrects, SDL_Rect * rects);
-static void FULLSCREEN_UpdateRectsMemCpy(_THIS, int numrects,
-                                         SDL_Rect * rects);
-static void FULLSCREEN_UpdateRects8bpp(_THIS, int numrects, SDL_Rect * rects);
-static void FULLSCREEN_UpdateRects16bpp(_THIS, int numrects,
-                                        SDL_Rect * rects);
-static void FULLSCREEN_UpdateRects32bpp(_THIS, int numrects,
-                                        SDL_Rect * rects);
-static void FULLSCREEN_UpdateRectsOS(_THIS, int numrects, SDL_Rect * rects);
-
-/* Local helper functions */
-static int cmpmodes(const void *va, const void *vb);
-static int FULLSCREEN_AddMode(_THIS, int bpp, int w, int h);
-void FULLSCREEN_SetWriteBank(int bank);
-void FULLSCREEN_SetDisplayBank(int bank);
-static void FULLSCREEN_DisableEscape();
-static void FULLSCREEN_EnableEscape();
-void FULLSCREEN_BuildModeList(_THIS);
-
-/* Following variable is set up in riskosTask.c */
-extern int riscos_backbuffer;   /* Create a back buffer in system memory for full screen mode */
-
-/* Following is used to create a sprite back buffer */
-extern unsigned char *WIMP_CreateBuffer(int width, int height, int bpp);
-
-/* Fast assembler copy */
-extern void RISCOS_Put32(void *to, int pixels, int pitch, int rows,
-                         void *from, int src_skip_bytes);
-
-SDL_Surface *
-FULLSCREEN_SetVideoMode(_THIS, SDL_Surface * current,
-                        int width, int height, int bpp, Uint32 flags)
-{
-    _kernel_swi_regs regs;
-    Uint32 Rmask = 0;
-    Uint32 Gmask = 0;
-    Uint32 Bmask = 0;
-    int create_back_buffer = riscos_backbuffer;
-
-    switch (bpp) {
-    case 8:
-        flags |= SDL_HWPALETTE;
-        break;
-
-    case 15:
-    case 16:
-        Bmask = 0x00007c00;
-        Gmask = 0x000003e0;
-        Rmask = 0x0000001f;
-        break;
-
-    case 32:
-        Bmask = 0x00ff0000;
-        Gmask = 0x0000ff00;
-        Rmask = 0x000000ff;
-        break;
-
-    default:
-        SDL_SetError("Pixel depth not supported");
-        return NULL;
-        break;
-    }
-
-    if (FULLSCREEN_SetMode(width, height, bpp) == 0) {
-        SDL_SetError("Couldn't set requested mode");
-        return (NULL);
-    }
-
-/* 	printf("Setting mode %dx%d\n", width, height); */
-
-    /* Allocate the new pixel format for the screen */
-    if (!SDL_ReallocFormat(current, bpp, Rmask, Gmask, Bmask, 0)) {
-        RISCOS_RestoreWimpMode();
-        SDL_SetError("Couldn't allocate new pixel format for requested mode");
-        return (NULL);
-    }
-
-    /* Set up the new mode framebuffer */
-    current->w = width;
-    this->hidden->height = current->h = height;
-
-    regs.r[0] = -1;             /* -1 for current screen mode */
-
-    /* Get screen width in bytes */
-    regs.r[1] = 6;              // Screen Width in bytes
-    _kernel_swi(OS_ReadModeVariable, &regs, &regs);
-
-    current->pitch = regs.r[2];
-
-    if (flags & SDL_DOUBLEBUF) {
-        regs.r[0] = 2;          /* Screen area */
-        _kernel_swi(OS_ReadDynamicArea, &regs, &regs);
-
-        /* Reg 1 has amount of memory currently used for display */
-        regs.r[0] = 2;          /* Screen area */
-        regs.r[1] = (current->pitch * height * 2) - regs.r[1];
-        if (_kernel_swi(OS_ChangeDynamicArea, &regs, &regs) != NULL) {
-            /* Can't allocate enough screen memory for double buffer */
-            flags &= ~SDL_DOUBLEBUF;
-        }
-    }
-
-    current->flags = flags | SDL_FULLSCREEN | SDL_HWSURFACE | SDL_PREALLOC;
-
-
-    /* Need to set display banks here for double buffering */
-    if (flags & SDL_DOUBLEBUF) {
-        FULLSCREEN_SetWriteBank(0);
-        FULLSCREEN_SetDisplayBank(1);
-
-        create_back_buffer = 0; /* Don't need a back buffer for a double buffered display */
-    }
-
-    FULLSCREEN_SetupBanks(this);
-
-    if (create_back_buffer) {
-        /* If not double buffered we may need to create a memory
-         ** back buffer to simulate processing on other OSes.
-         ** This is turned on by setting the enviromental variable
-         ** SDL$<name>$BackBuffer >= 1
-         */
-        if (riscos_backbuffer == 3)
-            this->hidden->bank[0] = WIMP_CreateBuffer(width, height, bpp);
-        else
-            this->hidden->bank[0] = SDL_malloc(height * current->pitch);
-        if (this->hidden->bank[0] == 0) {
-            RISCOS_RestoreWimpMode();
-            SDL_SetError("Couldnt allocate memory for back buffer");
-            return (NULL);
-        }
-        /* Surface updated in programs is now a software surface */
-        current->flags &= ~SDL_HWSURFACE;
-    }
-
-    /* Store address of allocated screen bank to be freed later */
-    if (this->hidden->alloc_bank)
-        SDL_free(this->hidden->alloc_bank);
-    if (create_back_buffer) {
-        this->hidden->alloc_bank = this->hidden->bank[0];
-        if (riscos_backbuffer == 3) {
-            this->hidden->bank[0] += 60;        /* Start of sprite data */
-            if (bpp == 8)
-                this->hidden->bank[0] += 2048;  /* 8bpp sprite have palette first */
-        }
-    } else
-        this->hidden->alloc_bank = 0;
-
-    // Clear both banks to black
-    SDL_memset(this->hidden->bank[0], 0, height * current->pitch);
-    SDL_memset(this->hidden->bank[1], 0, height * current->pitch);
-
-    this->hidden->current_bank = 0;
-    current->pixels = this->hidden->bank[0];
-
-    /* Have to set the screen here, so SetDeviceMode will pick it up */
-    this->screen = current;
-
-    /* Reset device functions for the wimp */
-    FULLSCREEN_SetDeviceMode(this);
-
-/*	FULLSCREEN_DisableEscape(); */
-
-    /* We're done */
-    return (current);
-}
-
-/* Reset any device functions that have been changed because we have run in WIMP mode */
-void
-FULLSCREEN_SetDeviceMode(_THIS)
-{
-    /* Update rects is different if we have a backbuffer */
-
-    if (riscos_backbuffer && (this->screen->flags & SDL_DOUBLEBUF) == 0) {
-        switch (riscos_backbuffer) {
-        case 2:                /* ARM code full word copy */
-            switch (this->screen->format->BytesPerPixel) {
-            case 1:            /* 8bpp modes */
-                this->UpdateRects = FULLSCREEN_UpdateRects8bpp;
-                break;
-            case 2:            /* 15/16bpp modes */
-                this->UpdateRects = FULLSCREEN_UpdateRects16bpp;
-                break;
-            case 4:            /* 32 bpp modes */
-                this->UpdateRects = FULLSCREEN_UpdateRects32bpp;
-                break;
-
-            default:           /* Just default to the memcpy routine */
-                this->UpdateRects = FULLSCREEN_UpdateRectsMemCpy;
-                break;
-            }
-            break;
-
-        case 3:                /* Use OS sprite plot routine */
-            this->UpdateRects = FULLSCREEN_UpdateRectsOS;
-            break;
-
-        default:               /* Old but safe memcpy */
-            this->UpdateRects = FULLSCREEN_UpdateRectsMemCpy;
-            break;
-        }
-    } else
-        this->UpdateRects = FULLSCREEN_UpdateRects;     /* Default do nothing implementation */
-
-    this->SetColors = FULLSCREEN_SetColors;
-
-    this->FlipHWSurface = FULLSCREEN_FlipHWSurface;
-
-    this->SetCaption = FULLSCREEN_SetWMCaption;
-    this->SetIcon = NULL;
-    this->IconifyWindow = NULL;
-
-    this->ShowWMCursor = RISCOS_ShowWMCursor;
-    this->WarpWMCursor = FULLSCREEN_WarpWMCursor;
-
-    this->PumpEvents = FULLSCREEN_PumpEvents;
-}
-
-/* Query for the list of available video modes */
-void
-FULLSCREEN_BuildModeList(_THIS)
-{
-    _kernel_swi_regs regs;
-    char *enumInfo = NULL;
-    char *enum_ptr;
-    int *blockInfo;
-    int j;
-    int num_modes;
-
-    /* Find out how much space we need */
-    regs.r[0] = 2;              /* Reason code */
-    regs.r[2] = 0;              /* Number of modes to skip */
-    regs.r[6] = 0;              /* pointer to block or 0 for count */
-    regs.r[7] = 0;              /* Size of block in bytes */
-    _kernel_swi(OS_ScreenMode, &regs, &regs);
-
-    num_modes = -regs.r[2];
-
-    /* Video memory should be in r[5] */
-    this->info.video_mem = regs.r[5] / 1024;
-
-    enumInfo = (unsigned char *) SDL_malloc(-regs.r[7]);
-    if (enumInfo == NULL) {
-        SDL_OutOfMemory();
-        return;
-    }
-    /* Read mode information into block */
-    regs.r[2] = 0;
-    regs.r[6] = (int) enumInfo;
-    regs.r[7] = -regs.r[7];
-    _kernel_swi(OS_ScreenMode, &regs, &regs);
-
-    enum_ptr = enumInfo;
-
-    for (j = 0; j < num_modes; j++) {
-        blockInfo = (int *) enum_ptr;
-        if ((blockInfo[1] & 255) == 1) {        /* We understand this format */
-            switch (blockInfo[4]) {
-            case 3:            /* 8 bits per pixel */
-                FULLSCREEN_AddMode(this, 8, blockInfo[2], blockInfo[3]);
-                break;
-            case 4:            /* 15 bits per pixel */
-                FULLSCREEN_AddMode(this, 15, blockInfo[2], blockInfo[3]);
-                break;
-            case 5:            /* 32 bits per pixel */
-                FULLSCREEN_AddMode(this, 32, blockInfo[2], blockInfo[3]);
-                break;
-            }
-        }
-
-        enum_ptr += blockInfo[0];
-    }
-
-    SDL_free(enumInfo);
-
-    /* Sort the mode lists */
-    for (j = 0; j < NUM_MODELISTS; ++j) {
-        if (SDL_nummodes[j] > 0) {
-            SDL_qsort(SDL_modelist[j], SDL_nummodes[j],
-                      sizeof *SDL_modelist[j], cmpmodes);
-        }
-    }
-}
-
-static int
-FULLSCREEN_FlipHWSurface(_THIS, SDL_Surface * surface)
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = 19;
-
-    FULLSCREEN_SetDisplayBank(this->hidden->current_bank);
-    this->hidden->current_bank ^= 1;
-    FULLSCREEN_SetWriteBank(this->hidden->current_bank);
-    surface->pixels = this->hidden->bank[this->hidden->current_bank];
-
-    /* Wait for Vsync */
-    _kernel_swi(OS_Byte, &regs, &regs);
-
-    return (0);
-}
-
-/* Nothing to do if we are writing direct to hardware */
-static void
-FULLSCREEN_UpdateRects(_THIS, int numrects, SDL_Rect * rects)
-{
-}
-
-/* Safe but slower Memory copy from our allocated back buffer */
-static void
-FULLSCREEN_UpdateRectsMemCpy(_THIS, int numrects, SDL_Rect * rects)
-{
-    int j;
-    char *to, *from;
-    int pitch = this->screen->pitch;
-    int row;
-    int xmult = this->screen->format->BytesPerPixel;
-    for (j = 0; j < numrects; j++) {
-        from = this->hidden->bank[0] + rects->x * xmult + rects->y * pitch;
-        to = this->hidden->bank[1] + rects->x * xmult + rects->y * pitch;
-        for (row = 0; row < rects->h; row++) {
-            SDL_memcpy(to, from, rects->w * xmult);
-            from += pitch;
-            to += pitch;
-        }
-        rects++;
-    }
-}
-
-/* Use optimized assembler memory copy. Deliberately copies extra columns if
-   necessary to ensure the rectangle is word aligned. */
-static void
-FULLSCREEN_UpdateRects8bpp(_THIS, int numrects, SDL_Rect * rects)
-{
-    int j;
-    char *to, *from;
-    int pitch = this->screen->pitch;
-    int width_bytes;
-    int src_skip_bytes;
-
-    for (j = 0; j < numrects; j++) {
-        from = this->hidden->bank[0] + rects->x + rects->y * pitch;
-        to = this->hidden->bank[1] + rects->x + rects->y * pitch;
-        width_bytes = rects->w;
-        if ((int) from & 3) {
-            int extra = ((int) from & 3);
-            from -= extra;
-            to -= extra;
-            width_bytes += extra;
-        }
-        if (width_bytes & 3)
-            width_bytes += 4 - (width_bytes & 3);
-        src_skip_bytes = pitch - width_bytes;
-
-        RISCOS_Put32(to, (width_bytes >> 2), pitch, (int) rects->h, from,
-                     src_skip_bytes);
-        rects++;
-    }
-}
-
-/* Use optimized assembler memory copy. Deliberately copies extra columns if
-   necessary to ensure the rectangle is word aligned. */
-static void
-FULLSCREEN_UpdateRects16bpp(_THIS, int numrects, SDL_Rect * rects)
-{
-    int j;
-    char *to, *from;
-    int pitch = this->screen->pitch;
-    int width_bytes;
-    int src_skip_bytes;
-
-    for (j = 0; j < numrects; j++) {
-        from = this->hidden->bank[0] + (rects->x << 1) + rects->y * pitch;
-        to = this->hidden->bank[1] + (rects->x << 1) + rects->y * pitch;
-        width_bytes = (((int) rects->w) << 1);
-        if ((int) from & 3) {
-            from -= 2;
-            to -= 2;
-            width_bytes += 2;
-        }
-        if (width_bytes & 3)
-            width_bytes += 2;
-        src_skip_bytes = pitch - width_bytes;
-
-        RISCOS_Put32(to, (width_bytes >> 2), pitch, (int) rects->h, from,
-                     src_skip_bytes);
-        rects++;
-    }
-}
-
-/* Use optimized assembler memory copy. 32 bpp modes are always word aligned */
-static void
-FULLSCREEN_UpdateRects32bpp(_THIS, int numrects, SDL_Rect * rects)
-{
-    int j;
-    char *to, *from;
-    int pitch = this->screen->pitch;
-    int width;
-
-    for (j = 0; j < numrects; j++) {
-        from = this->hidden->bank[0] + (rects->x << 2) + rects->y * pitch;
-        to = this->hidden->bank[1] + (rects->x << 2) + rects->y * pitch;
-        width = (int) rects->w;
-
-        RISCOS_Put32(to, width, pitch, (int) rects->h, from,
-                     pitch - (width << 2));
-        rects++;
-    }
-}
-
-/* Use operating system sprite plots. Currently this is much slower than the
-   other variants however accelerated sprite plotting can be seen on the horizon
-   so this prepares for it. */
-static void
-FULLSCREEN_UpdateRectsOS(_THIS, int numrects, SDL_Rect * rects)
-{
-    _kernel_swi_regs regs;
-    _kernel_oserror *err;
-    int j;
-    int y;
-
-    regs.r[0] = 28 + 512;
-    regs.r[1] = (unsigned int) this->hidden->alloc_bank;
-    regs.r[2] = (unsigned int) this->hidden->alloc_bank + 16;
-    regs.r[5] = 0;
-
-    for (j = 0; j < numrects; j++) {
-        y = this->screen->h - rects->y; /* top of clipping region */
-        _kernel_oswrch(24);     /* Set graphics clip region */
-        _kernel_oswrch((rects->x << this->hidden->xeig) & 0xFF);        /* left */
-        _kernel_oswrch(((rects->x << this->hidden->xeig) >> 8) & 0xFF);
-        _kernel_oswrch(((y - rects->h) << this->hidden->yeig) & 0xFF);  /* bottom */
-        _kernel_oswrch((((y - rects->h) << this->hidden->yeig) >> 8) & 0xFF);
-        _kernel_oswrch(((rects->x + rects->w - 1) << this->hidden->xeig) & 0xFF);       /* right */
-        _kernel_oswrch((((rects->x + rects->w -
-                          1) << this->hidden->xeig) >> 8) & 0xFF);
-        _kernel_oswrch(((y - 1) << this->hidden->yeig) & 0xFF); /* top */
-        _kernel_oswrch((((y - 1) << this->hidden->yeig) >> 8) & 0xFF);
-
-        regs.r[3] = 0;
-        regs.r[4] = 0;
-
-        if ((err = _kernel_swi(OS_SpriteOp, &regs, &regs)) != 0) {
-            printf("OS_SpriteOp failed \n%s\n", err->errmess);
-        }
-
-        rects++;
-
-        /* Reset to full screen clipping */
-        _kernel_oswrch(24);     /* Set graphics clip region */
-        _kernel_oswrch(0);      /* left */
-        _kernel_oswrch(0);
-        _kernel_oswrch(0);      /* bottom */
-        _kernel_oswrch(0);
-        _kernel_oswrch(((this->screen->w - 1) << this->hidden->xeig) & 0xFF);   /* right */
-        _kernel_oswrch((((this->screen->w -
-                          1) << this->hidden->xeig) >> 8) & 0xFF);
-        _kernel_oswrch(((this->screen->h - 1) << this->hidden->yeig) & 0xFF);   /* top */
-        _kernel_oswrch((((this->screen->h -
-                          1) << this->hidden->yeig) >> 8) & 0xFF);
-    }
-}
-
-
-int
-FULLSCREEN_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors)
-{
-    _kernel_swi_regs regs;
-    int palette[256];
-
-    regs.r[0] = -1;
-    regs.r[1] = -1;
-    regs.r[2] = (int) palette;
-    regs.r[3] = 1024;
-    regs.r[4] = 0;
-    _kernel_swi(ColourTrans_ReadPalette, &regs, &regs);
-
-    while (ncolors--) {
-        palette[firstcolor] =
-            ((colors->b) << 24) | ((colors->g) << 16) | ((colors->r) << 8);
-        firstcolor++;
-        colors++;
-    }
-
-    regs.r[0] = -1;
-    regs.r[1] = -1;
-    regs.r[2] = (int) palette;
-    regs.r[3] = 0;
-    regs.r[4] = 0;
-    _kernel_swi(ColourTrans_WritePalette, &regs, &regs);
-
-    return (1);
-}
-
-
-static int
-cmpmodes(const void *va, const void *vb)
-{
-    SDL_Rect *a = *(SDL_Rect **) va;
-    SDL_Rect *b = *(SDL_Rect **) vb;
-    if (a->w == b->w)
-        return b->h - a->h;
-    else
-        return b->w - a->w;
-}
-
-static int
-FULLSCREEN_AddMode(_THIS, int bpp, int w, int h)
-{
-    SDL_Rect *mode;
-    int i, index;
-    int next_mode;
-
-    /* Check to see if we already have this mode */
-    if (bpp < 8) {              /* Not supported */
-        return (0);
-    }
-    index = ((bpp + 7) / 8) - 1;
-    for (i = 0; i < SDL_nummodes[index]; ++i) {
-        mode = SDL_modelist[index][i];
-        if ((mode->w == w) && (mode->h == h)) {
-            return (0);
-        }
-    }
-
-    /* Set up the new video mode rectangle */
-    mode = (SDL_Rect *) SDL_malloc(sizeof *mode);
-    if (mode == NULL) {
-        SDL_OutOfMemory();
-        return (-1);
-    }
-    mode->x = 0;
-    mode->y = 0;
-    mode->w = w;
-    mode->h = h;
-
-    /* Allocate the new list of modes, and fill in the new mode */
-    next_mode = SDL_nummodes[index];
-    SDL_modelist[index] = (SDL_Rect **)
-        SDL_realloc(SDL_modelist[index],
-                    (1 + next_mode + 1) * sizeof(SDL_Rect *));
-    if (SDL_modelist[index] == NULL) {
-        SDL_OutOfMemory();
-        SDL_nummodes[index] = 0;
-        SDL_free(mode);
-        return (-1);
-    }
-    SDL_modelist[index][next_mode] = mode;
-    SDL_modelist[index][next_mode + 1] = NULL;
-    SDL_nummodes[index]++;
-
-    return (0);
-}
-
-void
-FULLSCREEN_SetWriteBank(int bank)
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = 112;
-    regs.r[1] = bank + 1;
-    _kernel_swi(OS_Byte, &regs, &regs);
-}
-
-void
-FULLSCREEN_SetDisplayBank(int bank)
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = 113;
-    regs.r[1] = bank + 1;
-    _kernel_swi(OS_Byte, &regs, &regs);
-}
-
-
-/** Disable special escape key processing */
-static void
-FULLSCREEN_DisableEscape()
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = 229;
-    regs.r[1] = 1;
-    regs.r[2] = 0;
-    _kernel_swi(OS_Byte, &regs, &regs);
-
-}
-
-/** Enable special escape key processing */
-static void
-FULLSCREEN_EnableEscape()
-{
-    _kernel_swi_regs regs;
-    regs.r[0] = 229;
-    regs.r[1] = 0;
-    regs.r[2] = 0;
-    _kernel_swi(OS_Byte, &regs, &regs);
-
-}
-
-/** Store caption in case this is called before we create a window */
-void
-FULLSCREEN_SetWMCaption(_THIS, const char *title, const char *icon)
-{
-    SDL_strlcpy(this->hidden->title, title,
-                SDL_arraysize(this->hidden->title));
-}
-
-/* Set screen mode
-*
-*  Returns 1 if mode is set ok, otherwise 0
-*/
-
-int
-FULLSCREEN_SetMode(int width, int height, int bpp)
-{
-    SCREENMODEBLOCK smb;
-    _kernel_swi_regs regs;
-
-    smb.flags = 1;
-    smb.x_pixels = width;
-    smb.y_pixels = height;
-    smb.mode_vars[0] = -1;
-
-    switch (bpp) {
-    case 8:
-        smb.pixel_depth = 3;
-        /* Note: Need to set ModeFlags to 128 and NColour variables to 255 get full 8 bit palette */
-        smb.mode_vars[0] = 0;
-        smb.mode_vars[1] = 128; /* Mode flags */
-        smb.mode_vars[2] = 3;
-        smb.mode_vars[3] = 255; /* NColour (number of colours -1) */
-        smb.mode_vars[4] = -1;  /* End of list */
-        break;
-
-    case 15:
-    case 16:
-        smb.pixel_depth = 4;
-        break;
-
-    case 32:
-        smb.pixel_depth = 5;
-        break;
-
-    default:
-        SDL_SetError("Pixel depth not supported");
-        return 0;
-        break;
-    }
-
-    smb.frame_rate = -1;
-
-    regs.r[0] = 0;
-    regs.r[1] = (int) &smb;
-
-    if (_kernel_swi(OS_ScreenMode, &regs, &regs) != 0) {
-        SDL_SetError("Couldn't set requested mode");
-        return 0;
-    }
-
-    /* Turn cursor off */
-    _kernel_oswrch(23);
-    _kernel_oswrch(1);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-    _kernel_oswrch(0);
-
-    return 1;
-}
-
-/* Get Start addresses for the screen banks */
-void
-FULLSCREEN_SetupBanks(_THIS)
-{
-    _kernel_swi_regs regs;
-    int block[5];
-    block[0] = 148;             /* Write screen start */
-    block[1] = 149;             /* Display screen start */
-    block[2] = 4;               /* X eig factor */
-    block[3] = 5;               /* Y eig factor */
-    block[4] = -1;              /* End of list of variables to request */
-
-    regs.r[0] = (int) block;
-    regs.r[1] = (int) block;
-    _kernel_swi(OS_ReadVduVariables, &regs, &regs);
-
-    this->hidden->bank[0] = (void *) block[0];
-    this->hidden->bank[1] = (void *) block[1];
-    this->hidden->xeig = block[2];
-    this->hidden->yeig = block[3];
-}
-
-/* Toggle to full screen mode from the WIMP */
-
-int
-FULLSCREEN_ToggleFromWimp(_THIS)
-{
-    int width = this->screen->w;
-    int height = this->screen->h;
-    int bpp = this->screen->format->BitsPerPixel;
-
-    RISCOS_StoreWimpMode();
-    if (FULLSCREEN_SetMode(width, height, bpp)) {
-        char *buffer = this->hidden->alloc_bank;        /* This is start of sprite data */
-        /* Support back buffer mode only */
-        if (riscos_backbuffer == 0)
-            riscos_backbuffer = 1;
-
-        FULLSCREEN_SetupBanks(this);
-
-        this->hidden->bank[0] = buffer + 60;    /* Start of sprite data */
-        if (bpp == 8)
-            this->hidden->bank[0] += 2048;      /* 8bpp sprite have palette first */
-
-        this->hidden->current_bank = 0;
-        this->screen->pixels = this->hidden->bank[0];
-
-        /* Copy back buffer to screen memory */
-        SDL_memcpy(this->hidden->bank[1], this->hidden->bank[0],
-                   width * height * this->screen->format->BytesPerPixel);
-
-        FULLSCREEN_SetDeviceMode(this);
-        return 1;
-    } else
-        RISCOS_RestoreWimpMode();
-
-    return 0;
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscosevents.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,598 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-     File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
-	 27 March 2003
-
-     Implements keyboard setup, event pump and keyboard and mouse polling
-*/
-
-
-#include "../../timer/SDL_timer_c.h"
-#include "../../events/SDL_sysevents.h"
-#include "../../events/SDL_events_c.h"
-#include "../SDL_cursor_c.h"
-#include "SDL_riscosvideo.h"
-#include "SDL_riscosevents_c.h"
-
-#include "memory.h"
-#include "stdlib.h"
-#include "ctype.h"
-
-#include "kernel.h"
-#include "swis.h"
-
-/* The translation table from a RISC OS internal key numbers to a SDL keysym */
-static SDLKey RO_keymap[SDLK_LAST];
-
-/* RISC OS Key codes */
-#define ROKEY_SHIFT 0
-#define ROKEY_CTRL  1
-#define ROKEY_ALT   2
-/* Left shift is first key we will check for */
-#define ROKEY_LEFT_SHIFT 3
-
-/* Need to ignore mouse buttons as they are processed separately */
-#define ROKEY_LEFT_MOUSE   9
-#define ROKEY_CENTRE_MOUSE 10
-#define ROKEY_RIGHT_MOUSE  11
-
-/* No key has been pressed return value*/
-#define ROKEY_NONE 255
-
-/* Id of last key in keyboard */
-#define ROKEY_LAST_KEY  124
-
-/* Size of array for all keys */
-#define ROKEYBD_ARRAYSIZE 125
-
-static char RO_pressed[ROKEYBD_ARRAYSIZE];
-
-static SDL_KeySym *TranslateKey(int intkey, SDL_KeySym * keysym, int pressed);
-
-void RISCOS_PollMouse(_THIS);
-void RISCOS_PollKeyboard();
-
-void RISCOS_PollMouseHelper(_THIS, int fullscreen);
-
-#if SDL_THREADS_DISABLED
-extern void DRenderer_FillBuffers();
-
-/* Timer running function */
-extern void RISCOS_CheckTimer();
-
-#endif
-
-void
-FULLSCREEN_PumpEvents(_THIS)
-{
-    /* Current implementation requires keyboard and mouse polling */
-    RISCOS_PollKeyboard();
-    RISCOS_PollMouse(this);
-#if SDL_THREADS_DISABLED
-//      DRenderer_FillBuffers();
-    if (SDL_timer_running)
-        RISCOS_CheckTimer();
-#endif
-}
-
-
-void
-RISCOS_InitOSKeymap(_THIS)
-{
-    int i;
-
-    /* Map the VK keysyms */
-    for (i = 0; i < SDL_arraysize(RO_keymap); ++i)
-        RO_keymap[i] = SDLK_UNKNOWN;
-
-    RO_keymap[3] = SDLK_LSHIFT;
-    RO_keymap[4] = SDLK_LCTRL;
-    RO_keymap[5] = SDLK_LALT;
-    RO_keymap[6] = SDLK_RSHIFT;
-    RO_keymap[7] = SDLK_RCTRL;
-    RO_keymap[8] = SDLK_RALT;
-    RO_keymap[16] = SDLK_q;
-    RO_keymap[17] = SDLK_3;
-    RO_keymap[18] = SDLK_4;
-    RO_keymap[19] = SDLK_5;
-    RO_keymap[20] = SDLK_F4;
-    RO_keymap[21] = SDLK_8;
-    RO_keymap[22] = SDLK_F7;
-    RO_keymap[23] = SDLK_MINUS, RO_keymap[25] = SDLK_LEFT;
-    RO_keymap[26] = SDLK_KP6;
-    RO_keymap[27] = SDLK_KP7;
-    RO_keymap[28] = SDLK_F11;
-    RO_keymap[29] = SDLK_F12;
-    RO_keymap[30] = SDLK_F10;
-    RO_keymap[31] = SDLK_SCROLLOCK;
-    RO_keymap[32] = SDLK_PRINT;
-    RO_keymap[33] = SDLK_w;
-    RO_keymap[34] = SDLK_e;
-    RO_keymap[35] = SDLK_t;
-    RO_keymap[36] = SDLK_7;
-    RO_keymap[37] = SDLK_i;
-    RO_keymap[38] = SDLK_9;
-    RO_keymap[39] = SDLK_0;
-    RO_keymap[41] = SDLK_DOWN;
-    RO_keymap[42] = SDLK_KP8;
-    RO_keymap[43] = SDLK_KP9;
-    RO_keymap[44] = SDLK_BREAK;
-    RO_keymap[45] = SDLK_BACKQUOTE;
-/*  RO_keymap[46] = SDLK_currency; TODO: Figure out if this has a value */
-    RO_keymap[47] = SDLK_BACKSPACE;
-    RO_keymap[48] = SDLK_1;
-    RO_keymap[49] = SDLK_2;
-    RO_keymap[50] = SDLK_d;
-    RO_keymap[51] = SDLK_r;
-    RO_keymap[52] = SDLK_6;
-    RO_keymap[53] = SDLK_u;
-    RO_keymap[54] = SDLK_o;
-    RO_keymap[55] = SDLK_p;
-    RO_keymap[56] = SDLK_LEFTBRACKET;
-    RO_keymap[57] = SDLK_UP;
-    RO_keymap[58] = SDLK_KP_PLUS;
-    RO_keymap[59] = SDLK_KP_MINUS;
-    RO_keymap[60] = SDLK_KP_ENTER;
-    RO_keymap[61] = SDLK_INSERT;
-    RO_keymap[62] = SDLK_HOME;
-    RO_keymap[63] = SDLK_PAGEUP;
-    RO_keymap[64] = SDLK_CAPSLOCK;
-    RO_keymap[65] = SDLK_a;
-    RO_keymap[66] = SDLK_x;
-    RO_keymap[67] = SDLK_f;
-    RO_keymap[68] = SDLK_y;
-    RO_keymap[69] = SDLK_j;
-    RO_keymap[70] = SDLK_k;
-    RO_keymap[72] = SDLK_SEMICOLON;
-    RO_keymap[73] = SDLK_RETURN;
-    RO_keymap[74] = SDLK_KP_DIVIDE;
-    RO_keymap[76] = SDLK_KP_PERIOD;
-    RO_keymap[77] = SDLK_NUMLOCK;
-    RO_keymap[78] = SDLK_PAGEDOWN;
-    RO_keymap[79] = SDLK_QUOTE;
-    RO_keymap[81] = SDLK_s;
-    RO_keymap[82] = SDLK_c;
-    RO_keymap[83] = SDLK_g;
-    RO_keymap[84] = SDLK_h;
-    RO_keymap[85] = SDLK_n;
-    RO_keymap[86] = SDLK_l;
-    RO_keymap[87] = SDLK_SEMICOLON;
-    RO_keymap[88] = SDLK_RIGHTBRACKET;
-    RO_keymap[89] = SDLK_DELETE;
-    RO_keymap[90] = SDLK_KP_MINUS;
-    RO_keymap[91] = SDLK_KP_MULTIPLY;
-    RO_keymap[93] = SDLK_EQUALS;
-    RO_keymap[94] = SDLK_BACKSLASH;
-    RO_keymap[96] = SDLK_TAB;
-    RO_keymap[97] = SDLK_z;
-    RO_keymap[98] = SDLK_SPACE;
-    RO_keymap[99] = SDLK_v;
-    RO_keymap[100] = SDLK_b;
-    RO_keymap[101] = SDLK_m;
-    RO_keymap[102] = SDLK_COMMA;
-    RO_keymap[103] = SDLK_PERIOD;
-    RO_keymap[104] = SDLK_SLASH;
-    RO_keymap[105] = SDLK_END;
-    RO_keymap[106] = SDLK_KP0;
-    RO_keymap[107] = SDLK_KP1;
-    RO_keymap[108] = SDLK_KP3;
-    RO_keymap[112] = SDLK_ESCAPE;
-    RO_keymap[113] = SDLK_F1;
-    RO_keymap[114] = SDLK_F2;
-    RO_keymap[115] = SDLK_F3;
-    RO_keymap[116] = SDLK_F5;
-    RO_keymap[117] = SDLK_F6;
-    RO_keymap[118] = SDLK_F8;
-    RO_keymap[119] = SDLK_F9;
-    RO_keymap[120] = SDLK_HASH;
-    RO_keymap[121] = SDLK_RIGHT;
-    RO_keymap[122] = SDLK_KP4;
-    RO_keymap[123] = SDLK_KP5;
-    RO_keymap[124] = SDLK_KP2;
-
-    SDL_memset(RO_pressed, 0, ROKEYBD_ARRAYSIZE);
-}
-
-
-/* Variable for mouse relative processing */
-int mouse_relative = 0;
-
-/* Check to see if we need to enter or leave mouse relative mode */
-
-void
-RISCOS_CheckMouseMode(_THIS)
-{
-    /* If the mouse is hidden and input is grabbed, we use relative mode */
-    if (!(SDL_cursorstate & CURSOR_VISIBLE) &&
-        (this->input_grab != SDL_GRAB_OFF)) {
-        mouse_relative = 1;
-    } else {
-        mouse_relative = 0;
-    }
-}
-
-
-void
-RISCOS_PollMouse(_THIS)
-{
-    RISCOS_PollMouseHelper(this, 1);
-}
-
-extern int mouseInWindow;
-
-void
-WIMP_PollMouse(_THIS)
-{
-    /* Only poll when mouse is over the window */
-    if (!mouseInWindow)
-        return;
-
-    RISCOS_PollMouseHelper(this, 0);
-}
-
-/* Static variables so only changes are reported */
-static Sint16 last_x = -1, last_y = -1;
-static int last_buttons = 0;
-
-/* Share routine between WIMP and FULLSCREEN for polling mouse and
-   passing on events */
-void
-RISCOS_PollMouseHelper(_THIS, int fullscreen)
-{
-    _kernel_swi_regs regs;
-    static int starting = 1;
-
-    if (_kernel_swi(OS_Mouse, &regs, &regs) == NULL) {
-        Sint16 new_x = regs.r[0];       /* Initialy get as OS units */
-        Sint16 new_y = regs.r[1];
-
-        /* Discard mouse events until they let go of the mouse after starting */
-        if (starting && regs.r[2] != 0)
-            return;
-        else
-            starting = 0;
-
-        if (new_x != last_x || new_y != last_y || last_buttons != regs.r[2]) {
-            /* Something changed so generate appropriate events */
-            int topLeftX, topLeftY;     /* Top left OS units */
-            int x, y;           /* Mouse position in SDL pixels */
-
-            if (fullscreen) {
-                topLeftX = 0;
-                topLeftY = (this->hidden->height << this->hidden->yeig) - 1;
-            } else {
-                int window_state[9];
-
-                /* Get current window state */
-                window_state[0] = this->hidden->window_handle;
-                regs.r[1] = (unsigned int) window_state;
-                _kernel_swi(Wimp_GetWindowState, &regs, &regs);
-
-                topLeftX = window_state[1];
-                topLeftY = window_state[4];
-            }
-
-            /* Convert co-ordinates to workspace */
-            x = new_x - topLeftX;
-            y = topLeftY - new_y;       /* Y goes from top of window/screen */
-
-            /* Convert OS units to pixels */
-            x >>= this->hidden->xeig;
-            y >>= this->hidden->yeig;
-
-            if (last_x != new_x || last_y != new_y) {
-                if (mouse_relative) {
-                    int centre_x = SDL_VideoSurface->w / 2;
-                    int centre_y = SDL_VideoSurface->h / 2;
-
-                    if (centre_x != x || centre_y != y) {
-                        if (SDL_VideoSurface)
-                            SDL_PrivateMouseMotion(0, 1,
-                                                   x - centre_x,
-                                                   y - centre_y);
-                        last_x = topLeftX + (centre_x << this->hidden->xeig);
-                        last_y = topLeftY - (centre_y << this->hidden->yeig);
-
-                        /* Re-centre the mouse pointer, so we still get relative
-                           movement when the mouse is at the edge of the window
-                           or screen.
-                         */
-                        {
-                            unsigned char block[5];
-
-                            block[0] = 3;       /* OSWORD move pointer sub-reason code */
-                            block[1] = last_x & 0xFF;
-                            block[2] = (last_x >> 8) & 0xFF;
-                            block[3] = last_y & 0xFF;
-                            block[4] = (last_y >> 8) & 0xFF;
-
-                            regs.r[0] = 21;     /* OSWORD pointer stuff code */
-                            regs.r[1] = (int) block;
-                            _kernel_swi(OS_Word, &regs, &regs);
-                        }
-                    }
-                } else {
-                    last_x = new_x;
-                    last_y = new_y;
-                    SDL_PrivateMouseMotion(0, 0, x, y);
-                }
-            }
-
-            if (last_buttons != regs.r[2]) {
-                int changed = last_buttons ^ regs.r[2];
-                last_buttons = regs.r[2];
-                if (changed & 4)
-                    SDL_PrivateMouseButton((last_buttons & 4) ?
-                                           SDL_PRESSED : SDL_RELEASED,
-                                           SDL_BUTTON_LEFT, 0, 0);
-                if (changed & 2)
-                    SDL_PrivateMouseButton((last_buttons & 2) ?
-                                           SDL_PRESSED : SDL_RELEASED,
-                                           SDL_BUTTON_MIDDLE, 0, 0);
-                if (changed & 1)
-                    SDL_PrivateMouseButton((last_buttons & 1) ?
-                                           SDL_PRESSED : SDL_RELEASED,
-                                           SDL_BUTTON_RIGHT, 0, 0);
-            }
-        }
-    }
-}
-
-void
-RISCOS_PollKeyboard()
-{
-    int which_key = ROKEY_LEFT_SHIFT;
-    int j;
-    int min_key, max_key;
-    SDL_KeySym key;
-
-    /* Scan the keyboard to see what is pressed */
-    while (which_key <= ROKEY_LAST_KEY) {
-        which_key = (_kernel_osbyte(121, which_key, 0) & 0xFF);
-        if (which_key != ROKEY_NONE) {
-            switch (which_key) {
-                /* Skip over mouse keys */
-            case ROKEY_LEFT_MOUSE:
-            case ROKEY_CENTRE_MOUSE:
-            case ROKEY_RIGHT_MOUSE:
-                which_key = ROKEY_RIGHT_MOUSE;
-                break;
-
-                /* Ignore keys that cause 2 internal number to be generated */
-            case 71:
-            case 24:
-            case 87:
-            case 40:
-                break;
-
-                /* Ignore break as it can be latched on */
-            case 44:
-                break;
-
-            default:
-                RO_pressed[which_key] += 2;
-                break;
-            }
-            which_key++;
-        }
-    }
-
-    /* Generate key released messages */
-    min_key = ROKEY_LAST_KEY + 1;
-    max_key = ROKEY_LEFT_SHIFT;
-
-    for (j = ROKEY_LEFT_SHIFT; j <= ROKEY_LAST_KEY; j++) {
-        if (RO_pressed[j]) {
-            if (RO_pressed[j] == 1) {
-                RO_pressed[j] = 0;
-                SDL_PrivateKeyboard(SDL_RELEASED, TranslateKey(j, &key, 0));
-            } else {
-                if (j < min_key)
-                    min_key = j;
-                if (j > max_key)
-                    max_key = j;
-            }
-        }
-    }
-
-    /* Generate key pressed messages */
-    for (j = min_key; j <= max_key; j++) {
-        if (RO_pressed[j]) {
-            if (RO_pressed[j] == 2) {
-                SDL_PrivateKeyboard(SDL_PRESSED, TranslateKey(j, &key, 1));
-            }
-            RO_pressed[j] = 1;
-        }
-    }
-}
-
-static SDL_KeySym *
-TranslateKey(int intkey, SDL_KeySym * keysym, int pressed)
-{
-    /* Set the keysym information */
-    keysym->scancode = (unsigned char) intkey;
-    keysym->sym = RO_keymap[intkey];
-    keysym->mod = KMOD_NONE;
-    keysym->unicode = 0;
-    if (pressed && SDL_TranslateUNICODE) {
-        int state;
-        int ch;
-
-        state = (_kernel_osbyte(202, 0, 255) & 0xFF);
-
-        /*TODO: Take into account other keyboard layouts */
-
-        ch = keysym->sym;       /* This should handle most unshifted keys */
-
-        if (intkey < 9 || ch == SDLK_UNKNOWN) {
-            ch = 0;
-
-        } else if (state & 64) {        /* Control on */
-            ch = ch & 31;
-
-        } else {
-            int topOfKey = 0;
-            if (state & 8) {    /* Shift on */
-                topOfKey = 1;
-            }
-
-            if ((state & 16) == 0) {    /* Caps lock is on */
-                if (ch >= SDLK_a && ch <= SDLK_z) {
-                    if ((state & 128) == 0) {   /* Shift Enable off */
-                        /* All letter become upper case */
-                        topOfKey = 1;
-                    } else {
-                        /* Shift+Letters gives lower case */
-                        topOfKey = 1 - topOfKey;
-                    }
-                }
-            }
-
-            if (topOfKey) {
-                /* Key produced with shift held down */
-
-                /* Letters just give upper case version */
-                if (ch >= SDLK_a && ch <= SDLK_z)
-                    ch = toupper(ch);
-                else {
-                    switch (ch) {
-                    case SDLK_HASH:
-                        ch = '~';
-                        break;
-                    case SDLK_QUOTE:
-                        ch = '@';
-                        break;
-                    case SDLK_COMMA:
-                        ch = '<';
-                        break;
-                    case SDLK_MINUS:
-                        ch = '_';
-                        break;
-                    case SDLK_PERIOD:
-                        ch = '>';
-                        break;
-                    case SDLK_SLASH:
-                        ch = '?';
-                        break;
-
-                    case SDLK_0:
-                        ch = ')';
-                        break;
-                    case SDLK_1:
-                        ch = '!';
-                        break;
-                    case SDLK_2:
-                        ch = '"';
-                        break;
-                    case SDLK_3:
-                        ch = '£';
-                        break;
-                    case SDLK_4:
-                        ch = '$';
-                        break;
-                    case SDLK_5:
-                        ch = '%';
-                        break;
-                    case SDLK_6:
-                        ch = '^';
-                        break;
-                    case SDLK_7:
-                        ch = '&';
-                        break;
-                    case SDLK_8:
-                        ch = '*';
-                        break;
-                    case SDLK_9:
-                        ch = '(';
-                        break;
-
-                    case SDLK_SEMICOLON:
-                        ch = ':';
-                        break;
-                    case SDLK_EQUALS:
-                        ch = '+';
-                        break;
-                    case SDLK_LEFTBRACKET:
-                        ch = '{';
-                        break;
-                    case SDLK_BACKSLASH:
-                        ch = '|';
-                        break;
-                    case SDLK_RIGHTBRACKET:
-                        ch = '}';
-                        break;
-                    case SDLK_BACKQUOTE:
-                        ch = '¬';
-                        break;
-
-                    default:
-                        ch = 0; /* Map to zero character if we don't understand it */
-                        break;
-                    }
-                }
-
-            } else if (ch > 126) {
-                /* SDL key code < 126 map directly onto their Unicode equivalents */
-                /* Keypad 0 to 9 maps to numeric equivalent */
-                if (ch >= SDLK_KP0 && ch <= SDLK_KP9)
-                    ch = ch - SDLK_KP0 + '0';
-                else {
-                    /* Following switch maps other keys that produce an Ascii value */
-                    switch (ch) {
-                    case SDLK_KP_PERIOD:
-                        ch = '.';
-                        break;
-                    case SDLK_KP_DIVIDE:
-                        ch = '/';
-                        break;
-                    case SDLK_KP_MULTIPLY:
-                        ch = '*';
-                        break;
-                    case SDLK_KP_MINUS:
-                        ch = '-';
-                        break;
-                    case SDLK_KP_PLUS:
-                        ch = '+';
-                        break;
-                    case SDLK_KP_EQUALS:
-                        ch = '=';
-                        break;
-
-                    default:
-                        /* If we don't know what it is set the Unicode to 0 */
-                        ch = 0;
-                        break;
-                    }
-                }
-            }
-        }
-
-        keysym->unicode = ch;
-    }
-    return (keysym);
-}
-
-/* end of SDL_riscosevents.c ... */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscosevents_c.h	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#include "SDL_riscosvideo.h"
-
-/* Variables and functions exported by SDL_sysevents.c to other parts 
-   of the native video subsystem (SDL_sysvideo.c)
-*/
-extern void RISCOS_InitOSKeymap(_THIS);
-extern void FULLSCREEN_PumpEvents(_THIS);
-extern void WIMP_PumpEvents(_THIS);
-
-/* end of SDL_nullevents_c.h ... */
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscosmouse.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,380 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-     File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
-	 27 March 2003
-
-     Implements mouse cursor shape definitions and positioning
-*/
-
-#include "SDL_mouse.h"
-#include "../../events/SDL_events_c.h"
-
-#include "SDL_riscosmouse_c.h"
-
-#include "kernel.h"
-#include "swis.h"
-
-static WMcursor *current_cursor = NULL;
-static WMcursor *defined_cursor = NULL;
-
-extern int mouseInWindow;
-
-/* Area to save cursor palette colours changed by SDL.
-   Actual values will be read before we change to the SDL cursor */
-static Uint8 wimp_cursor_palette[2][5] = {
-    {1, 25, 255, 255, 255},
-    {3, 25, 255, 255, 255}
-};
-
-static int cursor_palette_saved = 0;
-
-void WIMP_SaveCursorPalette();
-void WIMP_RestoreWimpCursor();
-void WIMP_SetSDLCursorPalette();
-
-
-void
-RISCOS_FreeWMCursor(_THIS, WMcursor * cursor)
-{
-    SDL_free(cursor->data);
-    SDL_free(cursor);
-}
-
-WMcursor *
-RISCOS_CreateWMCursor(_THIS,
-                      Uint8 * data, Uint8 * mask, int w, int h, int hot_x,
-                      int hot_y)
-{
-    WMcursor *cursor;
-    Uint8 *cursor_data;
-    Uint8 *ptr;
-    int i, j, k;
-    int data_byte, mask_byte;
-
-    /* Check to make sure the cursor size is okay */
-    if ((w > 32) || (h > 32)) {
-        SDL_SetError("Only with width and height <= 32 pixels are allowed");
-        return (NULL);
-    }
-
-    /* Allocate the cursor */
-    cursor = (WMcursor *) SDL_malloc(sizeof(*cursor));
-    if (cursor == NULL) {
-        SDL_SetError("Out of memory");
-        return (NULL);
-    }
-
-    /* Note: SDL says width must be a multiple of 8 */
-    cursor_data = SDL_malloc(w / 4 * h);
-    if (cursor_data == NULL) {
-        SDL_free(cursor);
-        SDL_SetError("Out of memory");
-        return (NULL);
-    }
-
-    cursor->w = w;
-    cursor->h = h;
-    cursor->hot_x = hot_x;
-    cursor->hot_y = hot_y;
-    cursor->data = cursor_data;
-
-
-/* Data / Mask Resulting pixel on screen 
-   0 / 1 White 
-   1 / 1 Black 
-   0 / 0 Transparent 
-   1 / 0 Inverted color if possible, black if not. 
-*/
-    ptr = cursor_data;
-
-    for (i = 0; i < h; ++i) {
-        for (j = 0; j < w / 8; ++j) {
-            data_byte = *data;
-            mask_byte = *mask;
-            *ptr++ = 0;         /* Sets whole byte transparent */
-            *ptr = 0;
-            for (k = 0; k < 8; k++) {
-                (*ptr) <<= 2;
-                if (data_byte & 1)
-                    *ptr |= 3;  /* Black or inverted */
-                else if (mask_byte & 1)
-                    *ptr |= 1;  /* White */
-                if ((k & 3) == 3)
-                    ptr--;
-                data_byte >>= 1;
-                mask_byte >>= 1;
-            }
-
-            ptr += 3;
-            data++;
-            mask++;
-        }
-    }
-
-    return (cursor);
-}
-
-int
-RISCOS_ShowWMCursor(_THIS, WMcursor * cursor)
-{
-    current_cursor = cursor;
-
-    if (cursor == NULL) {
-        _kernel_osbyte(106, 0, 0);
-        defined_cursor = NULL;
-    } else {
-        WMcursor *old_cursor = defined_cursor;
-
-        if (cursor != defined_cursor) {
-            Uint8 cursor_def[10];
-
-            cursor_def[0] = 0;
-            cursor_def[1] = 2;  /* Use shape number 2 */
-            cursor_def[2] = cursor->w / 4;      /* Width in bytes */
-            cursor_def[3] = cursor->h;  /* Height (h) in pixels */
-            cursor_def[4] = cursor->hot_x;      /* ActiveX in pixels from left */
-            cursor_def[5] = cursor->hot_y;      /* ActiveY in pixels from top */
-            cursor_def[6] = ((int) (cursor->data) & 0xFF);      /* Least significant byte of pointer to data */
-            cursor_def[7] = ((int) (cursor->data) >> 8) & 0xFF; /* ... */
-            cursor_def[8] = ((int) (cursor->data) >> 16) & 0xFF;        /* ... */
-            cursor_def[9] = ((int) (cursor->data) >> 24) & 0xFF;        /* Most significant byte of pointer to data */
-
-            if (_kernel_osword(21, (int *) cursor_def) != 0) {
-                SDL_SetError("RISCOS couldn't create the cursor to show");
-                return (0);
-            }
-            defined_cursor = cursor;
-        }
-
-        if (old_cursor == NULL) {
-            /* First time or reshow in window, so save/setup palette */
-            if (!cursor_palette_saved) {
-                WIMP_SaveCursorPalette();
-            }
-            WIMP_SetSDLCursorPalette();
-        }
-
-        _kernel_osbyte(106, 2, 0);
-    }
-
-    return (1);
-}
-
-void
-FULLSCREEN_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
-{
-    Uint8 move_block[5];
-    int eig_block[3];
-    _kernel_swi_regs regs;
-    int os_x, os_y;
-
-    eig_block[0] = 4;           /* X eig factor */
-    eig_block[1] = 5;           /* Y eig factor */
-    eig_block[2] = -1;          /* End of list of variables to request */
-
-    regs.r[0] = (int) eig_block;
-    regs.r[1] = (int) eig_block;
-    _kernel_swi(OS_ReadVduVariables, &regs, &regs);
-
-    os_x = x << eig_block[0];
-    os_y = y << eig_block[1];
-
-    move_block[0] = 3;          /* Move cursor */
-    move_block[1] = os_x & 0xFF;
-    move_block[2] = (os_x >> 8) & 0xFF;
-    move_block[3] = os_y & 0xFF;
-    move_block[4] = (os_y >> 8) & 0xFF;
-
-    _kernel_osword(21, (int *) move_block);
-    SDL_PrivateMouseMotion(0, 0, x, y);
-}
-
-
-/* Reshow cursor when mouse re-enters the window */
-void
-WIMP_ReshowCursor(_THIS)
-{
-    defined_cursor = NULL;
-    cursor_palette_saved = 0;
-    RISCOS_ShowWMCursor(this, current_cursor);
-}
-
-void
-WIMP_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
-{
-    _kernel_swi_regs regs;
-    int window_state[9];
-    char block[5];
-    int osX, osY;
-
-    window_state[0] = this->hidden->window_handle;
-    regs.r[1] = (unsigned int) window_state;
-    _kernel_swi(Wimp_GetWindowState, &regs, &regs);
-
-    osX = (x << this->hidden->xeig) + window_state[1];
-    osY = window_state[4] - (y << this->hidden->yeig);
-
-    block[0] = 3;
-    block[1] = osX & 0xFF;
-    block[2] = (osX >> 8) & 0xFF;
-    block[3] = osY & 0xFF;
-    block[4] = (osY >> 8) & 0xFF;
-
-    regs.r[0] = 21;
-    regs.r[1] = (int) block;
-    _kernel_swi(OS_Word, &regs, &regs);
-    SDL_PrivateMouseMotion(0, 0, x, y);
-}
-
-int
-WIMP_ShowWMCursor(_THIS, WMcursor * cursor)
-{
-    if (mouseInWindow)
-        return RISCOS_ShowWMCursor(this, cursor);
-    else
-        current_cursor = cursor;
-
-    return 1;
-}
-
-SDL_GrabMode
-RISCOS_GrabInput(_THIS, SDL_GrabMode mode)
-{
-    /* In fullscreen mode we don't need to do anything */
-    if (mode < SDL_GRAB_FULLSCREEN) {
-        _kernel_swi_regs regs;
-        unsigned char block[9];
-        block[0] = 1;           /* Define mouse cursor bounding block */
-
-        if (mode == SDL_GRAB_OFF) {
-            /* Clip to whole screen */
-
-            int r = (this->hidden->screen_width << this->hidden->xeig) - 1;
-            int t = (this->hidden->screen_height << this->hidden->yeig) - 1;
-
-            block[1] = 0;
-            block[2] = 0;       /* Left */
-            block[3] = 0;
-            block[4] = 0;       /* Bottom */
-            block[5] = r & 0xFF;
-            block[6] = (r >> 8) & 0xFF; /* Right */
-            block[7] = t & 0xFF;
-            block[8] = (t >> 8) & 0xFF; /* Top */
-        } else {
-            /* Clip to window */
-            unsigned char window_state[36];
-
-            *((int *) window_state) = this->hidden->window_handle;
-            regs.r[1] = (unsigned int) window_state;
-            _kernel_swi(Wimp_GetWindowState, &regs, &regs);
-
-            block[1] = window_state[4];
-            block[2] = window_state[5];
-            block[3] = window_state[8];
-            block[4] = window_state[9];
-            block[5] = window_state[12];
-            block[6] = window_state[13];
-            block[7] = window_state[16];
-            block[8] = window_state[17];
-
-        }
-
-        regs.r[0] = 21;         /* OS word code */
-        regs.r[1] = (int) block;
-        _kernel_swi(OS_Word, &regs, &regs);
-    }
-
-    return mode;
-}
-
-/* Save mouse cursor palette to be restore when we are no longer
-   defining a cursor */
-
-void
-WIMP_SaveCursorPalette()
-{
-    _kernel_swi_regs regs;
-    int colour;
-
-    for (colour = 0; colour < 2; colour++) {
-        regs.r[0] = (int) wimp_cursor_palette[colour][0];
-        regs.r[1] = 25;
-        /* Read settings with OS_ReadPalette */
-        if (_kernel_swi(0x2f, &regs, &regs) == NULL) {
-            wimp_cursor_palette[colour][2] =
-                (unsigned char) ((regs.r[2] >> 8) & 0xFF);
-            wimp_cursor_palette[colour][3] =
-                (unsigned char) ((regs.r[2] >> 16) & 0xFF);
-            wimp_cursor_palette[colour][4] =
-                (unsigned char) ((regs.r[2] >> 24) & 0xFF);
-        }
-    }
-
-    cursor_palette_saved = 1;
-}
-
-/* Restore the WIMP's cursor when we leave the SDL window */
-void
-WIMP_RestoreWimpCursor()
-{
-    int colour;
-
-    /* Reset to pointer shape 1 */
-    _kernel_osbyte(106, 1, 0);
-
-    /* Reset pointer colours */
-    if (cursor_palette_saved) {
-        for (colour = 0; colour < 2; colour++) {
-            _kernel_osword(12, (int *) wimp_cursor_palette[colour]);
-        }
-    }
-    cursor_palette_saved = 0;
-}
-
-/* Set palette used for SDL mouse cursors */
-void
-WIMP_SetSDLCursorPalette()
-{
-    /* First time set up the mouse colours */
-    Uint8 block[5];
-
-    /* Set up colour 1 as white */
-    block[0] = 1;               /* Colour to change 1 - 3 */
-    block[1] = 25;              /* Set pointer colour */
-    block[2] = 255;             /* red component */
-    block[3] = 255;             /* green component */
-    block[4] = 255;             /* blue component */
-    _kernel_osword(12, (int *) block);
-
-    /* Set colour 3 to back */
-    block[0] = 3;               /* Colour to change 1 - 3 */
-    block[1] = 25;              /* Set pointer colour */
-    block[2] = 0;               /* red component */
-    block[3] = 0;               /* green component */
-    block[4] = 0;               /* blue component */
-    _kernel_osword(12, (int *) block);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscosmouse_c.h	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#include "SDL_riscosvideo.h"
-
-/* The implementation dependent data for the window manager cursor */
-struct WMcursor
-{
-    int w;
-    int h;
-    int hot_x;
-    int hot_y;
-    Uint8 *data;
-};
-
-/* Functions to be exported */
-void RISCOS_FreeWMCursor(_THIS, WMcursor * cursor);
-WMcursor *RISCOS_CreateWMCursor(_THIS, Uint8 * data, Uint8 * mask, int w,
-                                int h, int hot_x, int hot_y);
-
-int RISCOS_ShowWMCursor(_THIS, WMcursor * cursor);
-void FULLSCREEN_WarpWMCursor(_THIS, Uint16 x, Uint16 y);
-
-int WIMP_ShowWMCursor(_THIS, WMcursor * cursor);
-void WIMP_WarpWMCursor(_THIS, Uint16 x, Uint16 y);
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscossprite.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-     File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability
-	 27 March 2003
-
-     Implements Sprite plotting code for wimp display.window
-*/
-
-#include "kernel.h"
-#include "swis.h"
-
-#include "SDL_stdinc.h"
-#include "SDL_riscosvideo.h"
-
-extern void WIMP_ReadModeInfo(_THIS);
-
-void WIMP_PaletteChanged(_THIS);
-
-
-/* Create sprite buffer for screen */
-
-unsigned char *
-WIMP_CreateBuffer(int width, int height, int bpp)
-{
-    int size;
-    char sprite_name[12] = "display";
-    unsigned char *buffer;
-    _kernel_swi_regs regs;
-    int bytesPerPixel;
-    int bytesPerRow;
-    int offsetToSpriteData = 60;
-
-    switch (bpp) {
-    case 32:
-        bytesPerPixel = 4;
-        break;
-    case 16:
-        bytesPerPixel = 2;
-        break;
-    case 8:
-        bytesPerPixel = 1;
-        offsetToSpriteData += 2048;     /* Add in size of palette */
-        break;
-    default:
-        return NULL;
-        break;
-    }
-
-    bytesPerRow = bytesPerPixel * width;
-
-    if ((bytesPerRow & 3) != 0) {
-        bytesPerRow += 4 - (bytesPerRow & 3);
-    }
-    size = bytesPerRow * height;
-
-    buffer = SDL_malloc((size_t) size + offsetToSpriteData);
-    if (!buffer)
-        return NULL;
-
-    /* Initialise a sprite area */
-
-    *(unsigned int *) buffer = size + offsetToSpriteData;
-    *(unsigned int *) (buffer + 8) = 16;
-
-    regs.r[0] = 256 + 9;
-    regs.r[1] = (unsigned int) buffer;
-    _kernel_swi(OS_SpriteOp, &regs, &regs);
-
-    regs.r[0] = 256 + 15;
-    regs.r[1] = (unsigned int) buffer;
-    regs.r[2] = (unsigned int) &sprite_name;
-    regs.r[3] = 0;              /* Palette flag: 0 = no palette */
-    regs.r[4] = width;
-    regs.r[5] = height;
-    if (bpp == 8) {
-        /* Use old style mode number */
-        regs.r[6] = 28;         /* 8bpp 90x90dpi */
-    } else {
-        regs.r[6] = (((bpp == 16) ? 5 : 6) << 27)       /* Type 6 = 32bpp sprite, 5 = 16bpp sprite */
-            |(90 << 14)         /* Vertical dpi */
-            |(90 << 1)          /* Horizontal dpi */
-            |1;                 /* Marker to distinguish between mode selectors and sprite modes */
-    }
-    if (_kernel_swi(OS_SpriteOp, &regs, &regs) == NULL) {
-        if (bpp == 8) {
-            /* Modify sprite to take into account 256 colour palette */
-            int *sprite = (int *) (buffer + 16);
-            /* Adjust sprite offsets */
-            sprite[0] += 2048;
-            sprite[8] += 2048;
-            sprite[9] += 2048;
-            /* Adjust sprite area next free pointer */
-            (*(int *) (buffer + 12)) += 2048;
-
-            /* Don't need to set up palette as SDL sets up the default
-               256 colour palette */
-/*          {
-             int *pal = sprite + 11;
-             unsigned int j;
-             unsigned int entry;
-             for (j = 0; j < 255; j++)
-             {
-                entry = (j << 24) | (j << 16) | (j << 8);
-                *pal++ = entry;
-                *pal++ = entry;
-             }
-          }
-*/
-        }
-    } else {
-        SDL_free(buffer);
-        buffer = NULL;
-    }
-
-    return buffer;
-}
-
-
-/* Setup translation buffers for the sprite plotting */
-
-void
-WIMP_SetupPlotInfo(_THIS)
-{
-    _kernel_swi_regs regs;
-    int *sprite = ((int *) this->hidden->bank[1]) + 4;
-
-    regs.r[0] = (unsigned int) this->hidden->bank[1];
-    regs.r[1] = (unsigned int) sprite;
-    regs.r[2] = -1;             /* Current mode */
-    regs.r[3] = -1;             /* Current palette */
-    regs.r[4] = 0;              /* Get size of buffer */
-    regs.r[5] = 1 | 2 | 16;     /* R1 - pointer to sprite and can use full palette words */
-    regs.r[6] = 0;
-    regs.r[7] = 0;
-
-    if (this->hidden->pixtrans)
-        SDL_free(this->hidden->pixtrans);
-    this->hidden->pixtrans = 0;
-
-    /* Get the size required for the buffer */
-    _kernel_swi(ColourTrans_GenerateTable, &regs, &regs);
-    if (regs.r[4]) {
-        this->hidden->pixtrans = SDL_malloc(regs.r[4]);
-
-        regs.r[4] = (unsigned int) this->hidden->pixtrans;
-        /* Actually read the buffer */
-        _kernel_swi(ColourTrans_GenerateTable, &regs, &regs);
-    }
-}
-
-/* Plot the sprite in the given context */
-void
-WIMP_PlotSprite(_THIS, int x, int y)
-{
-    _kernel_swi_regs regs;
-    _kernel_oserror *err;
-
-    regs.r[0] = 52 + 512;
-    regs.r[1] = (unsigned int) this->hidden->bank[1];
-    regs.r[2] = (unsigned int) this->hidden->bank[1] + 16;
-    regs.r[3] = x;
-    regs.r[4] = y;
-    regs.r[5] = 0 | 32;         /* Overwrite screen and pixtrans contains wide colour entries */
-    regs.r[6] = 0;              /* No scale factors i.e. 1:1 */
-    regs.r[7] = (int) this->hidden->pixtrans;
-
-    if ((err = _kernel_swi(OS_SpriteOp, &regs, &regs)) != 0) {
-        int *p = (int *) this->hidden->pixtrans;
-        printf("OS_SpriteOp failed \n%s\n", err->errmess);
-        printf("pixtrans %d\n", (int) this->hidden->pixtrans);
-        printf("%x %x %x\n", p[0], p[1], p[2]);
-    }
-}
-
-
-/* Wimp mode has changes so update colour mapping and pixel sizes 
-   of windows and the sprites they plot */
-
-void
-WIMP_ModeChanged(_THIS)
-{
-    int oldXeig = this->hidden->xeig;
-    int oldYeig = this->hidden->yeig;
-
-    WIMP_ReadModeInfo(this);
-
-    if (oldXeig == this->hidden->xeig && oldYeig == this->hidden->yeig) {
-        /* Only need to update the palette */
-        WIMP_PaletteChanged(this);
-    } else {
-        _kernel_swi_regs regs;
-        int window_state[9];
-        int extent[4];
-        int currWidth, currHeight;
-        int newWidth, newHeight;
-
-        /* Need to resize windows and update the palette */
-        WIMP_SetupPlotInfo(this);
-
-
-        window_state[0] = this->hidden->window_handle;
-        regs.r[1] = (unsigned int) window_state;
-        _kernel_swi(Wimp_GetWindowState, &regs, &regs);
-
-        currWidth = window_state[3] - window_state[1];
-        currHeight = window_state[4] - window_state[2];
-
-        newWidth = (currWidth >> oldXeig) << this->hidden->xeig;
-        newHeight = (currHeight >> oldYeig) << this->hidden->yeig;
-        /* Need to avoid extent getting too small for visible part
-           of window */
-        extent[0] = 0;
-        if (currHeight <= newHeight) {
-            extent[1] = -newHeight;
-        } else {
-            extent[1] = -currHeight;
-        }
-        if (currWidth <= newWidth) {
-            extent[2] = newWidth;
-        } else {
-            extent[2] = currWidth;
-        }
-        extent[3] = 0;
-
-        regs.r[0] = this->hidden->window_handle;
-        regs.r[1] = (int) extent;
-        _kernel_swi(Wimp_SetExtent, &regs, &regs);
-
-        /*TODO: May need to set flag to resize window on next open */
-    }
-}
-
-/* Palette has changed so update palettes used for windows sprites */
-
-void
-WIMP_PaletteChanged(_THIS)
-{
-    WIMP_SetupPlotInfo(this);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

--- a/src/video/riscos/SDL_riscostask.c	Wed Jan 26 19:20:16 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,367 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-    This file added by Alan Buckley (alan_baa@hotmail.com) to support RISC OS 
-	26 March 2003
-
-	File includes routines for:
-	  Setting up as a WIMP Task
-	  Reading information about the current desktop
-	  Storing information before a switch to full screen
-	  Restoring desktop after switching to full screen
-*/
-
-#include "kernel.h"
-#include "swis.h"
-
-#include "SDL_stdinc.h"
-#include "SDL_riscostask.h"
-
-#if !SDL_THREADS_DISABLED
-#include <pthread.h>
-pthread_t main_thread;
-#endif
-
-/* RISC OS variables */
-
-static int task_handle = 0;
-static int wimp_version = 0;
-
-/* RISC OS variables to help compatability with certain programs */
-int riscos_backbuffer = 0;      /* Create a back buffer in system memory for full screen mode */
-int riscos_closeaction = 1;     /* Close icon action */
-
-static int stored_mode = -1;    /* -1 when in desktop, mode number or pointer when full screen */
-
-extern int mouseInWindow;       /* Mouse is in WIMP window */
-
-/* Local function */
-
-static int RISCOS_GetTaskName(char *task_name, size_t maxlen);
-
-/* Uncomment next line to copy mode changes/restores to stderr */
-/* #define DUMP_MODE */
-#ifdef DUMP_MODE
-#include "stdio.h"
-static void
-dump_mode()
-{
-    fprintf(stderr, "mode %d\n", stored_mode);
-    if (stored_mode < -1 || stored_mode >= 256) {
-        int blockSize = 0;
-        int *storeBlock = (int *) stored_mode;
-
-        while (blockSize < 5 || storeBlock[blockSize] != -1) {
-            fprintf(stderr, "   %d\n", storeBlock[blockSize++]);
-        }
-    }
-}
-#endif
-
-/******************************************************************
-
- Initialise as RISC OS Wimp task
-
-*******************************************************************/
-
-int
-RISCOS_InitTask()
-{
-    char task_name[32];
-    _kernel_swi_regs regs;
-    int messages[4];
-
-    if (RISCOS_GetTaskName(task_name, SDL_arraysize(task_name)) == 0)
-        return 0;
-
-    messages[0] = 9;            /* Palette changed */
-    messages[1] = 0x400c1;      /* Mode changed */
-    messages[2] = 8;            /* Pre quit */
-    messages[2] = 0;
-
-    regs.r[0] = (unsigned int) 360;     /* Minimum version 3.6 */
-    regs.r[1] = (unsigned int) 0x4b534154;
-    regs.r[2] = (unsigned int) task_name;
-    regs.r[3] = (unsigned int) messages;
-
-    if (_kernel_swi(Wimp_Initialise, &regs, &regs) == 0) {
-        wimp_version = regs.r[0];
-        task_handle = regs.r[1];
-        return 1;
-    }
-#if !SDL_THREADS_DISABLED
-    main_thread = pthread_self();
-#endif
-
-    return 0;
-}
-
-/*********************************************************************
-
-  Close down application on exit.
-
-**********************************************************************/
-
-void
-RISCOS_ExitTask()
-{
-    _kernel_swi_regs regs;
-
-    if (stored_mode == -1) {
-        /* Ensure cursor is put back to standard pointer shape if
-           we have been running in a window */
-        _kernel_osbyte(106, 1, 0);
-    }
-
-    /* Ensure we end up back in the wimp */
-    RISCOS_RestoreWimpMode();
-
-    /* Neatly exit the task */
-    regs.r[0] = task_handle;
-    regs.r[1] = (unsigned int) 0x4b534154;
-    _kernel_swi(Wimp_CloseDown, &regs, &regs);
-    task_handle = 0;
-}
-
-/**************************************************************************
-
-  Get the name of the task for the desktop.
-
-  Param:   task_name - name of task 32 characters.
-
-  Returns: 1 is successful, otherwise 0
-
-  Notes:   Works by getting using OS_GetEnv to get the command line
-		   used to run the program and then parsing a name from it
-		   as follows.
-
-		   1. Use name after final period if not !RunImage
-		   2. If name is !RunImage then process item before the period
-		      in front of !RunImage.
-		   3. If directory name use that
-		   4. if in form <XXX$Dir> use the XXX.
-
-		   Finally once this value has been retrieved use it unless
-		   there is a variable set up in the form SDL$<name>$TaskName
-		   in which case the value of this variable will be used.
-
-		   Now also gets other RISC OS configuration varibles
-                SDL$<name>$BackBuffer - set to 1 to use a system memory backbuffer in fullscreen mode
-						    so updates wait until a call to SDL_UpdateRects. (default 0)
-						    This is required for programmes where they have assumed this is
-						    always the case which is contrary to the documentation.
-               SDL$<name>$CloseAction
-                    0 Don't show close icon
-                    1 Show close icon
-
-***************************************************************************/
-
-int
-RISCOS_GetTaskName(char *task_name, size_t maxlen)
-{
-    _kernel_swi_regs regs;
-
-    task_name[0] = 0;
-
-    /* Figure out a sensible task name */
-    if (_kernel_swi(OS_GetEnv, &regs, &regs) == 0) {
-        char *command_line = (char *) regs.r[0];
-        size_t len = SDL_strlen(command_line) + 1;
-        char *buffer = SDL_stack_alloc(char, len);
-        char *env_var;
-        char *p;
-
-        SDL_strlcpy(buffer, command_line, len);
-        p = SDL_strchr(buffer, ' ');
-        if (p)
-            *p = 0;
-        p = SDL_strrchr(buffer, '.');
-        if (p == 0)
-            p = buffer;
-        if (stricmp(p + 1, "!RunImage") == 0) {
-            *p = 0;
-            p = SDL_strrchr(buffer, '.');
-            if (p == 0)
-                p = buffer;
-        }
-        if (*p == '.')
-            p++;
-        if (*p == '!')
-            p++;                /* Skip "!" at beginning of application directories */
-
-        if (*p == '<') {
-            // Probably in the form <appname$Dir>
-            char *q = SDL_strchr(p, '$');
-            if (q == 0)
-                q = SDL_strchr(p, '>'); /* Use variable name if not */
-            if (q)
-                *q = 0;
-            p++;                /* Move over the < */
-        }
-
-        if (*p) {
-            /* Read variables that effect the RISC OS SDL engine for this task */
-            len = SDL_strlen(p) + 18;   /* 18 is larger than the biggest variable name */
-            env_var = SDL_stack_alloc(char, len);
-            if (env_var) {
-                char *env_val;
-
-                /* See if a variable of form SDL$<dirname>$TaskName exists */
-
-                SDL_strlcpy(env_var, "SDL$", len);
-                SDL_strlcat(env_var, p, len);
-                SDL_strlcat(env_var, "$TaskName", len);
-
-                env_val = SDL_getenv(env_var);
-                if (env_val)
-                    SDL_strlcpy(task_name, env_val, maxlen);
-
-                SDL_strlcpy(env_var, "SDL$", len);
-                SDL_strlcat(env_var, p, len);
-                SDL_strlcat(env_var, "$BackBuffer", len);
-
-                env_val = SDL_getenv(env_var);
-                if (env_val)
-                    riscos_backbuffer = atoi(env_val);
-
-                SDL_strlcpy(env_var, "SDL$", len);
-                SDL_strlcat(env_var, p, len);
-                SDL_strlcat(env_var, "$CloseAction", len);
-
-                env_val = SDL_getenv(env_var);
-                if (env_val && SDL_strcmp(env_val, "0") == 0)
-                    riscos_closeaction = 0;
-
-                SDL_stack_free(env_var);
-            }
-
-            if (!*task_name)
-                SDL_strlcpy(task_name, p, maxlen);
-        }
-
-        SDL_stack_free(buffer);
-    }
-
-    if (task_name[0] == 0)
-        SDL_strlcpy(task_name, "SDL Task", maxlen);
-
-    return 1;
-}
-
-/*****************************************************************
-
-  Store the current desktop screen mode if we are in the desktop.
-
-******************************************************************/
-
-void
-RISCOS_StoreWimpMode()
-{
-    _kernel_swi_regs regs;
-
-    /* Don't store if in full screen mode */
-    if (stored_mode != -1)
-        return;
-
-    regs.r[0] = 1;
-    _kernel_swi(OS_ScreenMode, &regs, &regs);
-    if (regs.r[1] >= 0 && regs.r[1] < 256)
-        stored_mode = regs.r[1];
-    else {
-        int blockSize = 0;
-        int *retBlock = (int *) regs.r[1];
-        int *storeBlock;
-        int j;
-
-        while (blockSize < 5 || retBlock[blockSize] != -1)
-            blockSize++;
-        blockSize++;
-        storeBlock = (int *) SDL_malloc(blockSize * sizeof(int));
-        retBlock = (int *) regs.r[1];
-        for (j = 0; j < blockSize; j++)
-            storeBlock[j] = retBlock[j];
-
-        stored_mode = (int) storeBlock;
-    }
-#if DUMP_MODE
-    fprintf(stderr, "Stored ");
-    dump_mode();
-#endif
-}
-
-/*****************************************************************
-
-  Restore desktop screen mode if we are in full screen mode.
-
-*****************************************************************/
-
-void
-RISCOS_RestoreWimpMode()
-{
-    _kernel_swi_regs regs;
-
-    /* Only need to restore if we are in full screen mode */
-    if (stored_mode == -1)
-        return;
-
-#if DUMP_MODE
-    fprintf(stderr, "Restored");
-    dump_mode();
-#endif
-
-    regs.r[0] = stored_mode;
-    _kernel_swi(Wimp_SetMode, &regs, &regs);
-    if (stored_mode < 0 || stored_mode > 256) {
-        SDL_free((int *) stored_mode);
-    }
-    stored_mode = -1;
-
-    /* Flush keyboard buffer to dump the keystrokes we've already polled */
-    regs.r[0] = 21;
-    regs.r[1] = 0;              /* Keyboard buffer number */
-    _kernel_swi(OS_Byte, &regs, &regs);
-
-    mouseInWindow = 0;
-
-}
-
-/*********************************************************************
-
-  Get version of Wimp running when task was initialised.
-
-*********************************************************************/
-
-int
-RISCOS_GetWimpVersion()
-{
-    return wimp_version;
-}
-
-int
-RISCOS_GetTaskHandle()
-{
-    return task_handle;
-}
-
-/* vi: set ts=4 sw=4 expandtab: */