Mercurial > sdl-ios-xcode
annotate src/video/bwindow/SDL_BView.h @ 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 | b8d311d90021 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
756
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
114
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
23 #ifndef _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
24 #define _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
25 |
| 0 | 26 #ifdef SAVE_RCSID |
| 27 static char rcsid = | |
| 28 "@(#) $Id$"; | |
| 29 #endif | |
| 30 | |
| 31 /* This is the event handling and graphics update portion of SDL_BWin */ | |
| 32 | |
| 33 extern "C" { | |
| 34 #include "SDL_events_c.h" | |
| 35 }; | |
| 36 | |
| 37 class SDL_BView : public BView | |
| 38 { | |
| 39 public: | |
| 40 SDL_BView(BRect frame) : | |
| 41 BView(frame, "SDL View", B_FOLLOW_ALL_SIDES, | |
| 42 (B_WILL_DRAW|B_FRAME_EVENTS)) { | |
| 43 image = NULL; | |
| 44 xoff = yoff = 0; | |
| 45 SetViewColor(0,0,0,0); | |
| 46 SetHighColor(0,0,0,0); | |
| 47 } | |
| 48 virtual ~SDL_BView() { | |
| 49 SetBitmap(NULL); | |
| 50 } | |
| 51 /* Set drawing offsets for fullscreen mode */ | |
| 52 virtual void SetXYOffset(int x, int y) { | |
| 53 xoff = x; | |
| 54 yoff = y; | |
| 55 } | |
|
1
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
56 virtual void GetXYOffset(int &x, int &y) { |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
57 x = xoff; |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
58 y = yoff; |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
59 } |
| 0 | 60 /* The view changed size. If it means we're in fullscreen, we |
| 61 * draw a nice black box in the entire view to get black borders. | |
| 62 */ | |
| 63 virtual void FrameResized(float width, float height) { | |
| 64 BRect bounds; | |
| 65 bounds.top = bounds.left = 0; | |
| 66 bounds.right = width; | |
| 67 bounds.bottom = height; | |
| 68 /* Fill the entire view with black */ | |
| 69 FillRect(bounds, B_SOLID_HIGH); | |
| 70 /* And if there's an image, redraw it. */ | |
| 71 if( image ) { | |
| 72 bounds = image->Bounds(); | |
| 73 Draw(bounds); | |
| 74 } | |
| 75 } | |
| 76 | |
| 77 /* Drawing portion of this complete breakfast. :) */ | |
| 78 virtual void SetBitmap(BBitmap *bitmap) { | |
| 79 if ( image ) { | |
| 80 delete image; | |
| 81 } | |
| 82 image = bitmap; | |
| 83 } | |
| 84 virtual void Draw(BRect updateRect) { | |
| 85 if ( image ) { | |
| 86 if(xoff || yoff) { | |
| 87 BRect dest; | |
| 88 dest.top = updateRect.top + yoff; | |
| 89 dest.left = updateRect.left + xoff; | |
| 90 dest.bottom = updateRect.bottom + yoff; | |
|
114
dabc453ce7f7
Now returns an error if unable to open audio on BeOS
Sam Lantinga <slouken@lokigames.com>
parents:
1
diff
changeset
|
91 dest.right = updateRect.right + xoff; |
| 0 | 92 DrawBitmap(image, updateRect, dest); |
| 93 } else { | |
| 94 DrawBitmap(image, updateRect, updateRect); | |
| 95 } | |
| 96 } | |
| 97 } | |
| 98 virtual void DrawAsync(BRect updateRect) { | |
| 99 if(xoff || yoff) { | |
| 100 BRect dest; | |
| 101 dest.top = updateRect.top + yoff; | |
| 102 dest.left = updateRect.left + xoff; | |
| 103 dest.bottom = updateRect.bottom + yoff; | |
| 104 dest.right = updateRect.right + xoff;; | |
| 105 DrawBitmapAsync(image, updateRect, dest); | |
| 106 } else { | |
| 107 DrawBitmapAsync(image, updateRect, updateRect); | |
| 108 } | |
| 109 } | |
| 110 | |
| 111 private: | |
| 112 BBitmap *image; | |
| 113 int xoff, yoff; | |
| 114 }; | |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
115 |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
116 #endif /* _SDL_BView_h */ |