Mercurial > sdl-ios-xcode
view src/video/riscos/SDL_wimppoll.c @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Sat, 19 Nov 2005 18:57:00 +0000 |
parents | 974ba6ae0fa3 |
children | d90b362628ea |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability 27 March 2003 Implements Pumping of events and WIMP polling */ #include "SDL.h" #include "SDL_syswm.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" #include "SDL_riscosvideo.h" #include "SDL_riscosevents_c.h" #include "SDL_riscosmouse_c.h" #include "SDL_timer_c.h" #include "memory.h" #include "stdlib.h" #include "ctype.h" #include "kernel.h" #include "swis.h" #include "unixlib/os.h" #ifndef DISABLE_THREADS #include <pthread.h> #endif /* Local functions */ void WIMP_Poll(_THIS, int waitTime); void WIMP_SetFocus(int win); /* SDL_riscossprite functions */ void WIMP_PlotSprite(_THIS, int x, int y); void WIMP_ModeChanged(_THIS); void WIMP_PaletteChanged(_THIS); extern void WIMP_PollMouse(_THIS); extern void RISCOS_PollKeyboard(); #ifdef DISABLE_THREADS /* Timer running function */ extern void RISCOS_CheckTimer(); #else extern int riscos_using_threads; #endif /* Mouse cursor handling */ extern void WIMP_ReshowCursor(_THIS); int hasFocus = 0; int mouseInWindow = 0; /* Flag to ensure window is correct size after a mode change */ static int resizeOnOpen = 0; void WIMP_PumpEvents(_THIS) { WIMP_Poll(this, 0); if (hasFocus) RISCOS_PollKeyboard(); if (mouseInWindow) WIMP_PollMouse(this); #ifdef DISABLE_THREADS if (SDL_timer_running) RISCOS_CheckTimer(); #endif } void WIMP_Poll(_THIS, int waitTime) { _kernel_swi_regs regs; int message[64]; unsigned int code; int pollMask = 0; int doPoll = 1; int sysEvent; int sdlWindow = this->hidden->window_handle; if (this->PumpEvents != WIMP_PumpEvents) return; if (waitTime > 0) { _kernel_swi(OS_ReadMonotonicTime, ®s, ®s); waitTime += regs.r[0]; } while (doPoll) { #ifndef DISABLE_THREADS /* Stop thread callbacks while program is paged out */ if (riscos_using_threads) __pthread_stop_ticker(); #endif if (waitTime <= 0) { regs.r[0] = pollMask; /* Poll Mask */ /* For no wait time mask out null event so we wait until something happens */ if (waitTime < 0) regs.r[0] |= 1; regs.r[1] = (int)message; _kernel_swi(Wimp_Poll, ®s, ®s); } else { regs.r[0] = pollMask; regs.r[1] = (int)message; regs.r[2] = waitTime; _kernel_swi(Wimp_PollIdle, ®s, ®s); } /* Flag to specify if we post a SDL_SysWMEvent */ sysEvent = 0; code = (unsigned int)regs.r[0]; switch(code) { case 0: /* Null Event - drop out for standard processing*/ doPoll = 0; break; case 1: /* Redraw window */ _kernel_swi(Wimp_RedrawWindow, ®s,®s); if (message[0] == sdlWindow) { while (regs.r[0]) { WIMP_PlotSprite(this, message[1], message[2]); _kernel_swi(Wimp_GetRectangle, ®s, ®s); } } else { /* TODO: Currently we just eat them - we may need to pass them on */ while (regs.r[0]) { _kernel_swi(Wimp_GetRectangle, ®s, ®s); } } break; case 2: /* Open window */ if ( resizeOnOpen && message[0] == sdlWindow) { /* Ensure window is correct size */ resizeOnOpen = 0; message[3] = message[1] + (this->screen->w << this->hidden->xeig); message[4] = message[2] + (this->screen->h << this->hidden->yeig); } _kernel_swi(Wimp_OpenWindow, ®s, ®s); break; case 3: /* Close window */ if (message[0] == sdlWindow) { /* Documentation makes it looks as if the following line is correct: ** if (SDL_PrivateQuit() == 1) _kernel_swi(Wimp_CloseWindow, ®s, ®s); ** However some programs don't process this message and so sit there invisibly ** in the background so I just post the quit message and hope the application ** does the correct thing. */ SDL_PrivateQuit(); } else sysEvent = 1; doPoll = 0; break; case 4: /* Pointer_Leaving_Window */ if (message[0] == sdlWindow) { mouseInWindow = 0; //TODO: Lose buttons / dragging /* Reset to default pointer */ regs.r[0] = 106; regs.r[1] = 1; regs.r[2] = 0; _kernel_swi(OS_Byte, ®s, ®s); SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); } else sysEvent = 1; break; case 5: /* Pointer_Entering_Window */ if (message[0] == sdlWindow) { mouseInWindow = 1; WIMP_ReshowCursor(this); SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); } else sysEvent = 1; break; case 6: /* Mouse_Click */ if (hasFocus == 0) { /* First click gives focus if it's not a menu */ /* we only count non-menu clicks on a window that has the focus */ WIMP_SetFocus(message[3]); } else doPoll = 0; // So PollMouse gets a chance to pick it up break; case 7: /* User_Drag_Box - Used for mouse release */ //TODO: May need to implement this in the future sysEvent = 1; break; case 8: /* Keypressed */ doPoll = 0; /* PollKeyboard should pick it up */ if (message[0] != sdlWindow) sysEvent = 1; /*TODO: May want to always pass F12 etc to the wimp { regs.r[0] = message[6]; _kernel_swi(Wimp_ProcessKey, ®s, ®s); } */ break; case 11: /* Lose Caret */ hasFocus = 0; if (message[0] == sdlWindow) SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS); else sysEvent = 1; break; case 12: /* Gain Caret */ hasFocus = 1; if (message[0] == sdlWindow) SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); else sysEvent = 1; break; case 17: case 18: sysEvent = 1; /* All messages are passed on */ switch(message[4]) { case 0: /* Quit Event */ /* No choice - have to quit */ SDL_Quit(); exit(0); break; case 8: /* Pre Quit */ SDL_PrivateQuit(); break; case 0x400c1: /* Mode change */ WIMP_ModeChanged(this); resizeOnOpen = 1; break; case 9: /* Palette changed */ WIMP_PaletteChanged(this); break; } break; default: /* Pass unknown events on */ sysEvent = 1; break; } if (sysEvent) { SDL_SysWMmsg wmmsg; SDL_VERSION(&wmmsg.version); wmmsg.eventCode = code; memcpy(wmmsg.pollBlock, message, 64 * sizeof(int)); /* Fall out of polling loop if message is successfully posted */ if (SDL_PrivateSysWMEvent(&wmmsg)) doPoll = 0; } #ifndef DISABLE_THREADS if (riscos_using_threads) { /* Restart ticker here so other thread can not interfere with the Redraw processing */ if (riscos_using_threads) __pthread_start_ticker(); /* Give other threads a better chance of running */ pthread_yield(); } #endif } } /* Set focus to specified window */ void WIMP_SetFocus(int win) { _kernel_swi_regs regs; regs.r[0] = win; regs.r[1] = -1; /* Icon handle */ regs.r[2] = 0; /* X-offset we just put it at position 0 */ regs.r[3] = 0; /* Y-offset as above */ regs.r[4] = 1 << 25; /* Caret is invisible */ regs.r[5] = 0; /* index into string */ _kernel_swi(Wimp_SetCaretPosition, ®s, ®s); } /** Run background task while in a sleep command */ void RISCOS_BackgroundTasks(void) { if (current_video && current_video->hidden->window_handle) { WIMP_Poll(current_video, 0); } #ifdef DISABLE_THREADS if (SDL_timer_running) RISCOS_CheckTimer(); #endif }