Commit Graph

3339 Commits

Author SHA1 Message Date
Sam Lantinga
99e65988f0 Better fix for bug 936
Check to for overruns before they happen instead of afterwards.
2010-07-18 10:26:46 -07:00
Sam Lantinga
45bccbbc5c Debian patch: 215_kfreebsd_gnu.diff 2010-07-18 08:12:28 -07:00
Sam Lantinga
f2b5f50026 Double-confirmed, that's not the pause scancode 2010-07-18 01:04:18 -07:00
Sam Lantinga
d49a84bb85 Added back in a little more debugging for the X11 keyboard code 2010-07-18 01:00:01 -07:00
Sam Lantinga
93aee3a1f7 Don't put a keysym in there! Shame on you! :) 2010-07-18 00:54:26 -07:00
Sam Lantinga
9f03a46420 Missed the numbering 2010-07-18 00:50:18 -07:00
Sam Lantinga
77f7140f6e Logitech G15 on Ubuntu 10.04:
code = 1, sym = 0xFF1B (Escape) scancode = 41 (Escape)
code = 2, sym = 0x31 (1) scancode = 30 (1)
code = 3, sym = 0x32 (2) scancode = 31 (2)
code = 4, sym = 0x33 (3) scancode = 32 (3)
code = 5, sym = 0x34 (4) scancode = 33 (4)
code = 6, sym = 0x35 (5) scancode = 34 (5)
code = 7, sym = 0x36 (6) scancode = 35 (6)
code = 8, sym = 0x37 (7) scancode = 36 (7)
code = 9, sym = 0x38 (8) scancode = 37 (8)
code = 10, sym = 0x39 (9) scancode = 38 (9)
code = 11, sym = 0x30 (0) scancode = 39 (0)
code = 12, sym = 0x2D (minus) scancode = 45 (-)
code = 13, sym = 0x3D (equal) scancode = 46 (=)
code = 14, sym = 0xFF08 (BackSpace) scancode = 42 (Backspace)
code = 15, sym = 0xFF09 (Tab) scancode = 43 (Tab)
code = 16, sym = 0x71 (q) scancode = 20 (Q)
code = 17, sym = 0x77 (w) scancode = 26 (W)
code = 18, sym = 0x65 (e) scancode = 8 (E)
code = 19, sym = 0x72 (r) scancode = 21 (R)
code = 20, sym = 0x74 (t) scancode = 23 (T)
code = 21, sym = 0x79 (y) scancode = 28 (Y)
code = 22, sym = 0x75 (u) scancode = 24 (U)
code = 23, sym = 0x69 (i) scancode = 12 (I)
code = 24, sym = 0x6F (o) scancode = 18 (O)
code = 25, sym = 0x70 (p) scancode = 19 (P)
code = 26, sym = 0x5B (bracketleft) scancode = 47 ([)
code = 27, sym = 0x5D (bracketright) scancode = 48 (])
code = 28, sym = 0xFF0D (Return) scancode = 40 (Return)
code = 29, sym = 0xFFE3 (Control_L) scancode = 224 (Left Ctrl)
code = 30, sym = 0x61 (a) scancode = 4 (A)
code = 31, sym = 0x73 (s) scancode = 22 (S)
code = 32, sym = 0x64 (d) scancode = 7 (D)
code = 33, sym = 0x66 (f) scancode = 9 (F)
code = 34, sym = 0x67 (g) scancode = 10 (G)
code = 35, sym = 0x68 (h) scancode = 11 (H)
code = 36, sym = 0x6A (j) scancode = 13 (J)
code = 37, sym = 0x6B (k) scancode = 14 (K)
code = 38, sym = 0x6C (l) scancode = 15 (L)
code = 39, sym = 0x3B (semicolon) scancode = 51 (;)
code = 40, sym = 0x27 (apostrophe) scancode = 52 (')
code = 41, sym = 0x60 (grave) scancode = 53 (`)
code = 42, sym = 0xFFE1 (Shift_L) scancode = 225 (Left Shift)
code = 43, sym = 0x5C (backslash) scancode = 49 (\)
code = 44, sym = 0x7A (z) scancode = 29 (Z)
code = 45, sym = 0x78 (x) scancode = 27 (X)
code = 46, sym = 0x63 (c) scancode = 6 (C)
code = 47, sym = 0x76 (v) scancode = 25 (V)
code = 48, sym = 0x62 (b) scancode = 5 (B)
code = 49, sym = 0x6E (n) scancode = 17 (N)
code = 50, sym = 0x6D (m) scancode = 16 (M)
code = 51, sym = 0x2C (comma) scancode = 54 (,)
code = 52, sym = 0x2E (period) scancode = 55 (.)
code = 53, sym = 0x2F (slash) scancode = 56 (/)
code = 54, sym = 0xFFE2 (Shift_R) scancode = 229 (Right Shift)
code = 55, sym = 0xFFAA (KP_Multiply) scancode = 85 (Keypad *)
code = 56, sym = 0xFFE9 (Alt_L) scancode = 226 (Left Alt)
code = 57, sym = 0x20 (space) scancode = 44 (Space)
code = 58, sym = 0xFFE5 (Caps_Lock) scancode = 57 (CapsLock)
code = 59, sym = 0xFFBE (F1) scancode = 58 (F1)
code = 60, sym = 0xFFBF (F2) scancode = 59 (F2)
code = 61, sym = 0xFFC0 (F3) scancode = 60 (F3)
code = 62, sym = 0xFFC1 (F4) scancode = 61 (F4)
code = 63, sym = 0xFFC2 (F5) scancode = 62 (F5)
code = 64, sym = 0xFFC3 (F6) scancode = 63 (F6)
code = 65, sym = 0xFFC4 (F7) scancode = 64 (F7)
code = 66, sym = 0xFFC5 (F8) scancode = 65 (F8)
code = 67, sym = 0xFFC6 (F9) scancode = 66 (F9)
code = 68, sym = 0xFFC7 (F10) scancode = 67 (F10)
code = 69, sym = 0xFF7F (Num_Lock) scancode = 83 (Numlock)
code = 70, sym = 0xFF14 (Scroll_Lock) scancode = 71 (ScrollLock)
code = 71, sym = 0xFF95 (KP_Home) scancode = 95 (Keypad 7)
code = 72, sym = 0xFF97 (KP_Up) scancode = 96 (Keypad 8)
code = 73, sym = 0xFF9A (KP_Prior) scancode = 97 (Keypad 9)
code = 74, sym = 0xFFAD (KP_Subtract) scancode = 86 (Keypad -)
code = 75, sym = 0xFF96 (KP_Left) scancode = 92 (Keypad 4)
code = 76, sym = 0xFF9D (KP_Begin) scancode = 93 (Keypad 5)
code = 77, sym = 0xFF98 (KP_Right) scancode = 94 (Keypad 6)
code = 78, sym = 0xFFAB (KP_Add) scancode = 87 (Keypad +)
code = 79, sym = 0xFF9C (KP_End) scancode = 89 (Keypad 1)
code = 80, sym = 0xFF99 (KP_Down) scancode = 90 (Keypad 2)
code = 81, sym = 0xFF9B (KP_Next) scancode = 91 (Keypad 3)
code = 82, sym = 0xFF9E (KP_Insert) scancode = 98 (Keypad 0)
code = 83, sym = 0xFF9F (KP_Delete) scancode = 99 (Keypad .)
code = 84, sym = 0xFE03 (ISO_Level3_Shift) scancode = 0 ()
code = 86, sym = 0x3C (less) scancode not found
code = 87, sym = 0xFFC8 (F11) scancode = 68 (F11)
code = 88, sym = 0xFFC9 (F12) scancode = 69 (F12)
code = 90, sym = 0xFF26 (Katakana) scancode = 0 ()
code = 91, sym = 0xFF25 (Hiragana) scancode = 0 ()
code = 92, sym = 0xFF23 (Henkan_Mode) scancode = 0 ()
code = 93, sym = 0xFF27 (Hiragana_Katakana) scancode = 0 ()
code = 94, sym = 0xFF22 (Muhenkan) scancode = 0 ()
code = 96, sym = 0xFF8D (KP_Enter) scancode = 88 (Keypad Enter)
code = 97, sym = 0xFFE4 (Control_R) scancode = 228 (Right Ctrl)
code = 98, sym = 0xFFAF (KP_Divide) scancode = 84 (Keypad /)
code = 99, sym = 0xFF61 (Print) scancode = 70 (PrintScreen)
code = 100, sym = 0xFFEA (Alt_R) scancode = 230 (Right Alt)
code = 101, sym = 0xFF0A (Linefeed) scancode = 0 ()
code = 102, sym = 0xFF50 (Home) scancode = 74 (Home)
code = 103, sym = 0xFF52 (Up) scancode = 82 (Up)
code = 104, sym = 0xFF55 (Prior) scancode = 75 (PageUp)
code = 105, sym = 0xFF51 (Left) scancode = 80 (Left)
code = 106, sym = 0xFF53 (Right) scancode = 79 (Right)
code = 107, sym = 0xFF57 (End) scancode = 77 (End)
code = 108, sym = 0xFF54 (Down) scancode = 81 (Down)
code = 109, sym = 0xFF56 (Next) scancode = 78 (PageDown)
code = 110, sym = 0xFF63 (Insert) scancode = 73 (Insert)
code = 111, sym = 0xFFFF (Delete) scancode = 76 (Delete)
code = 113, sym = 0x1008FF12 (XF86AudioMute) scancode = 0 ()
code = 114, sym = 0x1008FF11 (XF86AudioLowerVolume) scancode = 0 ()
code = 115, sym = 0x1008FF13 (XF86AudioRaiseVolume) scancode = 0 ()
code = 116, sym = 0x1008FF2A (XF86PowerOff) scancode = 0 ()
code = 117, sym = 0xFFBD (KP_Equal) scancode = 103 (Keypad =)
code = 118, sym = 0xB1 (plusminus) scancode not found
code = 119, sym = 0xFF13 (Pause) scancode = 72 (Pause)
code = 120, sym = 0x1008FF4A (XF86LaunchA) scancode = 0 ()
code = 121, sym = 0xFFAE (KP_Decimal) scancode = 99 (Keypad .)
code = 122, sym = 0xFF31 (Hangul) scancode = 0 ()
code = 123, sym = 0xFF34 (Hangul_Hanja) scancode = 0 ()
code = 125, sym = 0xFFEB (Super_L) scancode = 227 (Left GUI)
code = 126, sym = 0xFFEC (Super_R) scancode = 231 (Right GUI)
code = 127, sym = 0xFF67 (Menu) scancode = 118 (Menu)
code = 128, sym = 0xFF69 (Cancel) scancode = 120 (Stop)
code = 129, sym = 0xFF66 (Redo) scancode = 121 (Again)
code = 130, sym = 0x1005FF70 (SunProps) scancode = 0 ()
code = 131, sym = 0xFF65 (Undo) scancode = 122 (Undo)
code = 132, sym = 0x1005FF71 (SunFront) scancode = 0 ()
code = 133, sym = 0x1008FF57 (XF86Copy) scancode = 0 ()
code = 134, sym = 0x1005FF73 (SunOpen) scancode = 0 ()
code = 135, sym = 0x1008FF6D (XF86Paste) scancode = 0 ()
code = 136, sym = 0xFF68 (Find) scancode = 126 (Find)
code = 137, sym = 0x1008FF58 (XF86Cut) scancode = 0 ()
code = 138, sym = 0xFF6A (Help) scancode = 117 (Help)
code = 139, sym = 0x1008FF65 (XF86MenuKB) scancode = 0 ()
code = 140, sym = 0x1008FF1D (XF86Calculator) scancode = 0 ()
code = 142, sym = 0x1008FF2F (XF86Sleep) scancode = 0 ()
code = 143, sym = 0x1008FF2B (XF86WakeUp) scancode = 0 ()
code = 144, sym = 0x1008FF5D (XF86Explorer) scancode = 0 ()
code = 145, sym = 0x1008FF7B (XF86Send) scancode = 0 ()
code = 147, sym = 0x1008FF8A (XF86Xfer) scancode = 0 ()
code = 148, sym = 0x1008FF41 (XF86Launch1) scancode = 0 ()
code = 149, sym = 0x1008FF42 (XF86Launch2) scancode = 0 ()
code = 150, sym = 0x1008FF2E (XF86WWW) scancode = 0 ()
code = 151, sym = 0x1008FF5A (XF86DOS) scancode = 0 ()
code = 152, sym = 0x1008FF2D (XF86ScreenSaver) scancode = 0 ()
code = 154, sym = 0x1008FF74 (XF86RotateWindows) scancode = 0 ()
code = 155, sym = 0x1008FF19 (XF86Mail) scancode = 0 ()
code = 156, sym = 0x1008FF30 (XF86Favorites) scancode = 0 ()
code = 157, sym = 0x1008FF33 (XF86MyComputer) scancode = 0 ()
code = 158, sym = 0x1008FF26 (XF86Back) scancode = 0 ()
code = 159, sym = 0x1008FF27 (XF86Forward) scancode = 0 ()
code = 161, sym = 0x1008FF2C (XF86Eject) scancode = 0 ()
code = 162, sym = 0x1008FF2C (XF86Eject) scancode = 0 ()
code = 163, sym = 0x1008FF17 (XF86AudioNext) scancode = 0 ()
code = 164, sym = 0x1008FF14 (XF86AudioPlay) scancode = 0 ()
code = 165, sym = 0x1008FF16 (XF86AudioPrev) scancode = 0 ()
code = 166, sym = 0x1008FF15 (XF86AudioStop) scancode = 0 ()
code = 167, sym = 0x1008FF1C (XF86AudioRecord) scancode = 0 ()
code = 168, sym = 0x1008FF3E (XF86AudioRewind) scancode = 0 ()
code = 169, sym = 0x1008FF6E (XF86Phone) scancode = 0 ()
code = 171, sym = 0x1008FF81 (XF86Tools) scancode = 0 ()
code = 172, sym = 0x1008FF18 (XF86HomePage) scancode = 0 ()
code = 173, sym = 0x1008FF73 (XF86Reload) scancode = 0 ()
code = 174, sym = 0x1008FF56 (XF86Close) scancode = 0 ()
code = 177, sym = 0x1008FF78 (XF86ScrollUp) scancode = 0 ()
code = 178, sym = 0x1008FF79 (XF86ScrollDown) scancode = 0 ()
code = 179, sym = 0x28 (parenleft) scancode not found
code = 180, sym = 0x29 (parenright) scancode not found
code = 181, sym = 0x1008FF68 (XF86New) scancode = 0 ()
code = 182, sym = 0xFF66 (Redo) scancode = 121 (Again)
code = 183, sym = 0x1008FF81 (XF86Tools) scancode = 0 ()
code = 184, sym = 0x1008FF45 (XF86Launch5) scancode = 0 ()
code = 185, sym = 0x1008FF65 (XF86MenuKB) scancode = 0 ()
code = 192, sym = 0x1008FFA9 (XF86TouchpadToggle) scancode = 0 ()
code = 195, sym = 0xFF7E (Mode_switch) scancode = 257 (ModeSwitch)
code = 200, sym = 0x1008FF14 (XF86AudioPlay) scancode = 0 ()
code = 201, sym = 0x1008FF31 (XF86AudioPause) scancode = 0 ()
code = 202, sym = 0x1008FF43 (XF86Launch3) scancode = 0 ()
code = 203, sym = 0x1008FF44 (XF86Launch4) scancode = 0 ()
code = 204, sym = 0x1008FF4B (XF86LaunchB) scancode = 0 ()
code = 205, sym = 0x1008FFA7 (XF86Suspend) scancode = 0 ()
code = 206, sym = 0x1008FF56 (XF86Close) scancode = 0 ()
code = 207, sym = 0x1008FF14 (XF86AudioPlay) scancode = 0 ()
code = 208, sym = 0x1008FF97 (XF86AudioForward) scancode = 0 ()
code = 210, sym = 0xFF61 (Print) scancode = 70 (PrintScreen)
code = 212, sym = 0x1008FF8F (XF86WebCam) scancode = 0 ()
code = 215, sym = 0x1008FF19 (XF86Mail) scancode = 0 ()
code = 217, sym = 0x1008FF1B (XF86Search) scancode = 0 ()
code = 219, sym = 0x1008FF3C (XF86Finance) scancode = 0 ()
code = 221, sym = 0x1008FF36 (XF86Shop) scancode = 0 ()
code = 223, sym = 0xFF69 (Cancel) scancode = 120 (Stop)
code = 224, sym = 0x1008FF03 (XF86MonBrightnessDown) scancode = 0 ()
code = 225, sym = 0x1008FF02 (XF86MonBrightnessUp) scancode = 0 ()
code = 226, sym = 0x1008FF32 (XF86AudioMedia) scancode = 0 ()
code = 227, sym = 0x1008FF59 (XF86Display) scancode = 0 ()
code = 228, sym = 0x1008FF04 (XF86KbdLightOnOff) scancode = 0 ()
code = 229, sym = 0x1008FF06 (XF86KbdBrightnessDown) scancode = 0 ()
code = 230, sym = 0x1008FF05 (XF86KbdBrightnessUp) scancode = 0 ()
code = 231, sym = 0x1008FF7B (XF86Send) scancode = 0 ()
code = 232, sym = 0x1008FF72 (XF86Reply) scancode = 0 ()
code = 233, sym = 0x1008FF90 (XF86MailForward) scancode = 0 ()
code = 234, sym = 0x1008FF77 (XF86Save) scancode = 0 ()
code = 235, sym = 0x1008FF5B (XF86Documents) scancode = 0 ()
code = 236, sym = 0x1008FF93 (XF86Battery) scancode = 0 ()
code = 237, sym = 0x1008FF94 (XF86Bluetooth) scancode = 0 ()
code = 238, sym = 0x1008FF95 (XF86WLAN) scancode = 0 ()
2010-07-18 00:40:17 -07:00
Sam Lantinga
7ba6775100 Added a couple missing keys on my Logitech G15 keyboard on a Mac Pro running Ubuntu 10.04. 2010-07-17 23:25:10 -07:00
Sam Lantinga
ac279884c4 Fixed typo in the documentation 2010-07-17 22:59:28 -07:00
Sam Lantinga
6920164fad Fixed bug 1014
Don't send events for unprintable characters
2010-07-17 18:57:51 -07:00
Sam Lantinga
e880b725c0 Fixed bug 1022
Fixed the X11 icon on 64-bit systems
2010-07-17 18:44:34 -07:00
Sam Lantinga
774e4ce3f5 Added support for testing window manager icons 2010-07-14 21:25:15 -07:00
Sam Lantinga
a20175b675 Fixed bug #1000
Don't crash if someone tries to delete a context after we've unloaded the library.  In this case it's SDL_compat that doesn't know SDL_VideoQuit() has been called.  Hmm...
2010-07-14 07:48:35 -07:00
Sam Lantinga
abe03eb793 pelya 2010-07-12 03:53:48 PDT
In function GLES_RenderCopy() in SDL_renderer_gles.c:819 there is one memcpy()
that can be avoided if we're updating whole texture.
Because of that the SDL 1.3 in compatibility mode is working even slower than
software rendering in SDL 1.2.
2010-07-14 07:31:35 -07:00
Sam Lantinga
2d63dc10b4 Zero any fields not explicitly filled in. 2010-07-14 07:25:07 -07:00
Sam Lantinga
6ad28bf626 Now that the fullscreen wm state works, enable the video modes. Yay! :) 2010-07-14 01:02:18 -07:00
Sam Lantinga
f359555c64 Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. 2010-07-14 00:56:08 -07:00
Sam Lantinga
1fa5363e3a Let the window manager know we're a "normal" window 2010-07-14 00:28:15 -07:00
Sam Lantinga
2995c71aeb Much better debugging of property changes 2010-07-14 00:08:46 -07:00
Sam Lantinga
4fa4fde20f Turned off debug spew 2010-07-13 23:14:00 -07:00
Sam Lantinga
332544ff40 Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Unfortunately, this doesn't work.  I also noticed that maximizing doesn't work as well.  Also xprop hangs when trying to list properties of SDL windows.... ???
2010-07-13 23:11:10 -07:00
Sam Lantinga
31e17885c7 Added test case for maximize code 2010-07-13 23:05:14 -07:00
Sam Lantinga
0c8dcac0b6 Use a better switch for the clipboard property format 2010-07-13 22:39:46 -07:00
Sam Lantinga
753ad58277 Fixed compile warnings 2010-07-13 22:26:50 -07:00
Sam Lantinga
56a9f48542 Fixed compile warning 2010-07-13 22:25:30 -07:00
Sam Lantinga
eef59d7ccd Fixed compile warning 2010-07-13 22:24:46 -07:00
Sam Lantinga
322aa25962 Fixed compile warning. 2010-07-13 22:22:43 -07:00
Sam Lantinga
9ecac589b8 Daniel Wyatt 2010-03-26 14:52:53 PDT
If a non-console Windows SDL program has a non-quoted 0th argument followed
optionally by more non-quoted arguments and then by an empty quoted argument,
it will crash (attempts to dereference a NULL pointer).

In other words, something like this:
test.exe [non-quoted args] "" [...]

The fix is a one-liner in ParseCommandLine() of
src/main/win32/SDL_win32_main.c.

You can test this with any non-console SDL program on windows like this:
1) Open a console (cmd.exe)
2) Launch the program in one of the following ways:
program ""
program arg1 ""
program arg1 "" arg3

These will not cause a crash:
"program" [...]
program "arg1" ""

When a Windows program is launched from Explorer, its 0th argument seems to
always be quoted, so it won't be a problem in that case.

I've tested this on Windows XP SP3 and Windows 7.
2010-07-12 22:08:50 -07:00
Sam Lantinga
b07db7e9c3 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. 2010-07-12 01:20:57 -07:00
Sam Lantinga
e026e96e95 Made it possible to switch the text format in one place 2010-07-12 00:49:26 -07:00
Sam Lantinga
b758d7ddd5 Added X11 clipboard support.
As far as I know there isn't any real way to tell when the clipboard contents have changed without polling them, so I didn't implement the clipboard update event on X11.
2010-07-12 00:36:55 -07:00
Sam Lantinga
8c81b4fdae Fixed compile warnings 2010-07-12 00:35:24 -07:00
Sam Lantinga
6540320beb Fixed compile warnings 2010-07-12 00:35:14 -07:00
Sam Lantinga
c9dcaef79e Fixed compiler warning 2010-07-12 00:33:24 -07:00
Sam Lantinga
b833ea1351 Amazingly the Windows code is almost identical to the Mac OS X code. :) 2010-07-08 23:07:34 -07:00
Sam Lantinga
ddf0465549 Added an event when the clipboard is updated, triggered after the window gains the keyboard focus. 2010-07-08 22:54:03 -07:00
Sam Lantinga
8a86c556fd Made the new public headers public 2010-07-08 06:21:48 -07:00
Sam Lantinga
f8e47b7402 Updated Xcode project files for clipboard API
Fixed generation of SDL_revision.h when hg is in the path set up in .bash_profile
2010-07-08 06:16:27 -07:00
Sam Lantinga
ca5e2aca83 Added Windows clipboard support 2010-07-08 05:43:34 -07:00
Sam Lantinga
01e31dbb30 Added Mac OS X implementation of clipboard support 2010-07-08 00:35:58 -07:00
Sam Lantinga
fe0b80fa05 I missed the Objective C files when updating the copyright date... 2010-07-08 00:03:39 -07:00
Sam Lantinga
4ceea8d275 Added simple clipboard test 2010-07-08 00:00:07 -07:00
Sam Lantinga
8697bbff30 Need to add new headers to Makefile.in 2010-07-07 23:59:20 -07:00
Sam Lantinga
e4fe1bb40f Simplified clipboard API for sanity's sake.
A complete clipboard implementation would support multiple formats that could be queried at runtime, events for when the clipboard contents changed, support for HTML, images, etc.  We're not going that crazy, at least for now. :)
2010-07-07 23:54:03 -07:00
Sam Lantinga
2612b4c651 Whoops, updated the copyright date 2010-07-07 23:26:07 -07:00
Sam Lantinga
261b8d8865 First pass at clipboard API, still very much in progress 2010-07-07 23:24:04 -07:00
Sam Lantinga
a517ddf4a5 Added SDL_FOURCC() 2010-07-07 21:36:09 -07:00
Sam Lantinga
46bbcfe087 Turn on blending if we're converting from a surface with colorkey enabled 2010-07-07 21:35:44 -07:00
Sam Lantinga
e983e5bb65 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now)
Updated iPhone demos (which build and run again)
2010-07-07 18:58:51 -07:00
Sam Lantinga
a7b73120cb The arguments to main() should be NULL terminated (SuS v3 compliant) 2010-07-06 22:26:03 -07:00