Commit graph

517 commits

Author SHA1 Message Date
Bob Pendleton
e27a71b3a7 ran make indent
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402747
2008-03-14 20:43:44 +00:00
Bob Pendleton
71656d10c7 re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being
fixed is caused by clearing SDL_COPY_RLE_COLORKEY without setting SDL_COPY_RLE_DESIRED in SDL_UnRELSurface.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402746
2008-03-14 18:17:49 +00:00
Sam Lantinga
49f4428692 First pass of new SDL scancode concept for X11.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402717
2008-02-07 15:31:09 +00:00
Sam Lantinga
02f2e328bd First pass implementation of new SDL scancode concept, as discussed with
Christian Walther.  Currently only implemented on Mac OS X for sanity
checking purposes.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402715
2008-02-05 07:19:23 +00:00
Ryan C. Gordon
844280a6a9 Merged r3534:3535 from branches/SDL-1.2: Reset direction flag in SDL_revcpy().
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402714
2008-02-04 17:25:33 +00:00
Bob Pendleton
79041b0a87 Minimal implementation of textinput events for x11. It only works for latin-1.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402709
2008-01-15 22:37:17 +00:00
Bob Pendleton
e558eee568 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402704
2008-01-08 00:10:46 +00:00
Sam Lantinga
1a95219d9e Fixed bug #464
Added X1/X2 button constants

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402668
2007-12-29 06:09:25 +00:00
Sam Lantinga
1cb50341fd Merged revision 3458 from SDL 1.2, fixed Borland C alloca() prototype
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402649
2007-12-28 08:07:57 +00:00
Ryan C. Gordon
a29f17021d Merged r3449:3450 from branches/SDL-1.2: SDL_config.h.in Linux joystick fix.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402641
2007-09-25 10:01:10 +00:00
Sam Lantinga
68d2b55278 Split out the SDL_rect and SDL_surface functions into their own headers.
Removed unused count from the dirty rect list.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402639
2007-09-10 12:20:02 +00:00
Ryan C. Gordon
c09d2e0f0d Ported PulseAudio target from 1.2 to 1.3 interfaces, and added it to the trunk.
Fixes Bugzilla #439.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402633
2007-08-20 01:02:37 +00:00
Sam Lantinga
f0da180be1 Date: Thu, 05 Jul 2007 14:02:33 -0700
From: Sam Lantinga
Subject: SDL 1.3 keyboard plan

After lots of discussion with Christian, this is what we came up with:

> So, to sum up...
> SDLK_* become the physical keys, starting at > (1<<21)
> We create a macro SDLK_INDEX(X)
> We have two functions SDL_GetLayoutKey(SDLKey) and SDL_GetKeyName()
> SDL_GetLayoutKey maps to UCS4 for printable characters, and SDLK* for
  non-printable characters
> and does so based on the OS's current keyboard layout
> SDL_GetKeyName() handles both SDLK_* and UCS4, converting UCS4 to UTF-8 and
  converting SDLK_* into our names, which are UTF-8 for printable characters.
> WASD folks use SDLK_*, and 'I' folks use SDL_GetLayoutKey(SDLK_*)

Here is the patch he came up with, and his e-mail about it:

Date: Fri, 17 Aug 2007 19:50:28 +0200
From: Christian Walther
Subject: Re: SDL 1.3 keyboard plan

> Sounds great, go ahead and send me a patch.

Here goes! Thanks for having a look. Don't hesitate to comment if
anything does not conform to your ideas.

One caveat: Committing this now may break compilability of some video
drivers - specifically, if they use any of the SDLK_* codes that were
obsoleted and moved into SDL_compat.h. I only tried Cocoa (which did
break, but is already fixed) and X11 (which didn't, but then its key
handling is #iffed out). If that's a problem, it may need to go into
a branch.

  -Christian

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402630
2007-08-19 14:52:52 +00:00
Sam Lantinga
cf548d0a6b Okay, still some bugs, but everything builds again...
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402629
2007-08-18 05:39:09 +00:00
Sam Lantinga
2e91636dda More work in progress integrating SDL_Surface and the new SDL_Texture API
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402628
2007-08-18 01:44:21 +00:00
Sam Lantinga
79f25b0b9e Moved the colorkey and per-surface alpha into the blit info,
in preparation for support for general color channel modulation.

Removed and consolidated some data in the blit info.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402619
2007-08-17 00:54:53 +00:00
Sam Lantinga
37fe3a93e6 Removed hermes since it's LGPL and not compatible with a commercial license.
Prepping for using MMX and SSE intrinsics instead of inline assembly.
.. except for memcpy equivalents which only get faster if they can
   exploit the parallelism of loading into multiple SIMD registers. :)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402609
2007-08-15 08:21:10 +00:00
Sam Lantinga
bb3b316228 Date: Wed, 15 Aug 2007 01:08:38 +0200
From: Couriersud
Subject: Some SDL1.3 patches

fixed a compiler warning

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402604
2007-08-15 03:20:55 +00:00
Sam Lantinga
6b348f07c7 Emphasized the separation between SDL_Surface and SDL_Texture
- SDL_Surface is a system memory representation of pixel data
 - SDL_Texture is a video memory representation of pixel data

The concept of SDL_Surface with SDL_HWSURFACE is no longer used.

Separated SDL_Texture types by usage rather than memory type
 - SDL_TEXTUREACCESS_STATIC is for rarely changed pixel data,
   can be placed in video memory.
 - SDL_TEXTUREACCESS_STREAMING is for frequently changing pixel
   data, usually placed in system memory or AGP memory.

Optimized the SDL_compat usage of the OpenGL renderer by only
using one copy of the framebuffer instead of two.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402584
2007-08-11 20:54:31 +00:00
Sam Lantinga
9524d51857 Fixed bug #467
Remove trailing commas from enums

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402565
2007-07-22 13:22:47 +00:00
Sam Lantinga
eba7e38433 Fixed bug #460
Added SDL_VIDEO_OPENGL_CGL to the default Mac OS X config file.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402552
2007-07-16 14:19:47 +00:00
Sam Lantinga
53fac91c80 Warn Visual C++ users if they have a stale configure generated SDL_config.h
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402492
2007-07-12 03:14:49 +00:00
Sam Lantinga
e7c690e52e Oh yeah, they're boolean values...
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402458
2007-07-10 05:29:56 +00:00
Sam Lantinga
1330dc92d3 Updated to use size_t instead of int for amounts of data.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402457
2007-07-10 05:25:19 +00:00
Sam Lantinga
8daaa10d40 Merged read-ahead support for Win32 file I/O from SDL 1.2 revision 3183
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402456
2007-07-10 05:01:22 +00:00
Sam Lantinga
203416ced2 Fixed bug #451
SDL_memset4 copies a 32-bit value, not an 8-bit value.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402444
2007-07-08 14:24:55 +00:00
Sam Lantinga
82e02091bc Reverted mousewheel support in 1.2, since it breaks binary compatibility.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402431
2007-07-06 13:45:10 +00:00
Sam Lantinga
43e5d2b938 Fixed bug #382
Added horizontal scrolling support

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402428
2007-07-06 09:22:18 +00:00
Sam Lantinga
1066adb528 Fix for bug #447 merged from SDL 1.2
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402408
2007-07-04 08:01:04 +00:00
Sam Lantinga
5d2577791f Fixed bug #349
Solaris doesn't support the LATIN1 character set alias.

Merged from 1.2 svn revision 3133f

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402406
2007-07-04 07:08:16 +00:00
Ryan C. Gordon
0bc6c747b8 Patched to compile (missing #endif from a mismerge). Thanks to Peter Mackay
for pointing it out.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402392
2007-06-29 11:08:53 +00:00
Sam Lantinga
d3a9b053cd Merge iconv const changes from 1.2
I'm not entirely happy with them.  Maybe the right way to go is to leave
SDL_iconv() taking a non-const inbuf?  How often are we converting const
strings anyway?

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402388
2007-06-28 06:57:08 +00:00
Ryan C. Gordon
29fe04615f Fixed previous VC6 patch.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402374
2007-06-21 18:50:00 +00:00
Ryan C. Gordon
04255e0015 Merged r3094:3095 from branches/SDL-1.2: Visual C++ 6.0 fixes.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402372
2007-06-21 18:21:49 +00:00
Bob Pendleton
5bb1d2ceb7 Added a WindowID to the user event and cleaned up a little bit of formating
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402370
2007-06-20 00:01:04 +00:00
Sam Lantinga
80dcd123dc Key repeat is handled by the OS, since text input is now decoupled from physical key events.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402368
2007-06-16 15:32:04 +00:00
Ryan C. Gordon
cbe1b1f5e0 Removed EPOC port from the 1.3 branch.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402362
2007-06-15 15:54:07 +00:00
Ryan C. Gordon
dd54d0a607 Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402355
2007-06-15 07:21:01 +00:00
Sam Lantinga
554147b6c7 make indent
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402345
2007-06-14 13:21:29 +00:00
Ryan C. Gordon
152b74331d Merged r3037:3038 from branches/SDL-1.2: Mac OS X memcpy/memset selection.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402325
2007-06-03 08:39:23 +00:00
Ryan C. Gordon
dfd9387039 Merged r3007:3008 from branches/SDL-1.2: MapRGB/MapRGBA const correctness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402299
2007-04-04 09:43:53 +00:00
Ryan C. Gordon
a71b4bf05d Merge of r2554:2995 from branches/SDL-1.2: AvailabilityMacros.h for Mac OS X.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402287
2007-03-27 00:39:03 +00:00
Ryan C. Gordon
aa48694b67 Merged r2981:2982 from branches/SDL-1.2: fbcon getpagesize() compile fix.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402274
2007-02-15 23:57:07 +00:00
Ryan C. Gordon
d4e3fdd999 Merged r2956:2957 from branches/SDL-1.2: Digital Mars stdint.h usage.
Fixes Bugzilla #376.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402262
2007-02-12 11:46:08 +00:00
Ryan C. Gordon
84c4a54d7a Merge r2918:2919 from 1.2 branch: alloca macro params in parentheses.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402241
2006-11-29 10:34:05 +00:00
Ryan C. Gordon
2a14d5cdca Fixed building of Windows waveout audio.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402228
2006-11-11 06:48:57 +00:00
Ryan C. Gordon
28c9fb92a1 Removed AmigaOS code for 1.3 branch.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402215
2006-10-29 04:09:17 +00:00
Sam Lantinga
05a29201de indent is evil
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402208
2006-10-28 16:48:03 +00:00
Ryan C. Gordon
0089ba6cbe Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402195
2006-10-17 09:15:21 +00:00
Ryan C. Gordon
c500a06379 Double Whoops. :P
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402132
2006-10-01 16:10:41 +00:00