Commit graph

1079 commits

Author SHA1 Message Date
Ryan C. Gordon
3a608a4430 Patch from Antonio SJ Musumeci:
"
This code with SDL-1.2.8 and CVS:

#include <stdio.h>
#include <stdlib.h>
#include <SDL.h>

int
main(int argc, char** argv)
{
   char alphabet[26] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
   char buffer_file[27] = {0};
   char buffer_mem[27]  = {0};
   int rv_file;
   int rv_mem;
   FILE* file_ptr;
   SDL_RWops* rwop_file;
   SDL_RWops* rwop_mem;

   file_ptr = fopen("./blah", "w");
   fwrite(alphabet, 1, sizeof(alphabet), file_ptr);
   fclose(file_ptr);

   rwop_mem  = SDL_RWFromMem(alphabet, sizeof(alphabet));
   rwop_file = SDL_RWFromFile("./blah", "r");
   rv_mem  = SDL_RWread(rwop_mem , buffer_mem,  5, 6);
   rv_file = SDL_RWread(rwop_file, buffer_file, 5, 6);
   printf("From File: %d %s\n"
          "From Mem:  %d %s\n",
	 rv_file,
	 buffer_file,
	 rv_mem,
	 buffer_mem);
   printf("Seek end of File: %d\n"
	 "Seek end of Mem:  %d\n",
	 SDL_RWseek(rwop_file, 0, SEEK_END),
	 SDL_RWseek(rwop_mem , 0, SEEK_END));
   SDL_RWclose(rwop_file);
   SDL_RWclose(rwop_mem);

   return 0;
}


Produces this output:

 From File: 5 ABCDEFGHIJKLMNOPQRSTUVWXYZ
 From Mem:  5 ABCDEFGHIJKLMNOPQRSTUVWXY
Seek end of File: 26
Seek end of Mem:  26
"

--ryan.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401079
2005-06-24 12:48:38 +00:00
Ryan C. Gordon
a3c1fe415f The Darwin/MacOSX joystick code is largely copied from the HID Utilities
package...make the symbols defined by HID Utilities static inside SDL so that
 an app can link against their own copy of this package without symbol clash.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401078
2005-06-15 23:41:57 +00:00
Patrice Mandin
f1867eeb87 [PATCH] SDL_GetVideoMode() do not find the best video mode
The current GetVideoMode() function stops at the first mode which has any
dimensions smaller than the one asked, and gives the previous in the list.

If I ask 336x224 with this list:
768x480 768x240 640x400 640x200 384x480 384x240 320x400 320x200
SDL will give me 640x400, because 640x200 as height smaller than what I
asked.

However the best mode is the smaller which has both dimensions bigger
than the one asked (384x240 in my example).

This patch fixes this, plus it does not rely on a sorted video mode list.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401077
2005-06-12 16:12:55 +00:00
Patrice Mandin
7dc6f6ec45 Use wrong line length of menubar save buffer
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401076
2005-06-07 13:30:06 +00:00
Patrice Mandin
c939af3952 Save/restore system palette when application topped/untopped
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401075
2005-06-07 11:52:46 +00:00
Patrice Mandin
5c3476bac3 Another forgotten variable declaration
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401074
2005-06-06 21:50:26 +00:00
Patrice Mandin
d1f0ebd372 Use correct system function to free memory
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401073
2005-06-06 16:54:03 +00:00
Patrice Mandin
6368b80bbe SDL will center surface on screen for us
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401072
2005-06-06 16:36:18 +00:00
Patrice Mandin
712b49b43d Forgot variable declaration
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401071
2005-06-06 10:45:53 +00:00
Patrice Mandin
8b97e0145b Restore and save menu bar when entering and exiting fullscreen mode
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401070
2005-06-06 10:27:22 +00:00
Patrice Mandin
19e3a0374d Can not grab mouse
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401069
2005-06-06 10:26:40 +00:00
Patrice Mandin
b2f12b0900 Better mouse lose/gain focus
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401068
2005-06-03 08:18:55 +00:00
Patrice Mandin
d950aa13c6 Resize window to fit asked video mode
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401067
2005-06-02 22:02:18 +00:00
Patrice Mandin
324e30cda6 Enable/disable mouse focus
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401066
2005-06-02 22:00:48 +00:00
Patrice Mandin
bb02e3194a Add Centscreen extended modes support
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401065
2005-05-31 12:31:11 +00:00
Patrice Mandin
b9094f71eb Used wrong offset in joystick packet
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401064
2005-05-20 20:37:28 +00:00
Sam Lantinga
4233943186 Date: Tue, 22 Mar 2005 23:50:20 +0100
From: Johannes Schmidt
Subject: [PATCH] Re: [SDL] SDL 1.2.8 Prerelease

On Saturday 18 December 2004 13:59, Stephane Marchesin wrote:
> >#error "The kernel sources in /usr/src/linux are not yet configured."
> >#error "Please run 'make cloneconfig && make dep' in /usr/src/linux/"
> >#error "to get a kernel that is configured like the running kernel."
> >#error "Alternatively, you can copy one of the config files"
> >#error "arch/$ARCH/defconfig.* to .config, and run"
> >#error "'make oldconfig && make dep' to configure the kernel"
> >#error "for that configuration."
> >-
>
> That's the Suse kernel sources...
> I think the only way out is to add a test in ./configure

Attached is a patch (it works for me[TM]) which adds a CheckLinuxVersion() to
configure.in and a check for HAVE_LINUX_VERSION_H to
src/cdrom/linux/SDL_syscdrom.c.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401063
2005-05-20 07:34:34 +00:00
Patrice Mandin
901bb54c0c Add Falcon Centscreen extension support
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401062
2005-05-18 17:02:17 +00:00
Sam Lantinga
78aeed71c4 Support SDL_VIDEO_X11_NODIRECTCOLOR for OpenGL visuals
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401061
2005-05-16 08:23:34 +00:00
Sam Lantinga
53aa2122f0 Date: Tue, 10 May 2005 22:15:25 +0100
From: Peter Naulls
Subject: RISC OS SDL patch

Some of the RISC OS audio code is no longer used do to the switch to
/dev/dsp, and can be removed as per the attached diff.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401060
2005-05-16 07:43:46 +00:00
Sam Lantinga
16bce3b7ad Eh, more correct.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401059
2005-05-16 05:55:17 +00:00
Sam Lantinga
86cb73f365 Date: Mon, 02 May 2005 04:23:16 -0500
From: Jonathan Atkins
Subject: Re: [PATCH] *CRITICAL* 8bit direct RGB palette not being created

I think that SDL_AllocFormat should create the palette for all 8bit
surfaces.  And when the RGBAmasks match the normal 3:3:2:0 we need to
apply the old behavior.  If the mask doesn't match that, then we need
to make the right palette assuming the masks are valid (I don't think
we validate any masks for high color surfaces...so we wouldn't here)
Then there's always a palette available for the 8bit surfaces.
This restores the normal behavior and allows for masks to create
palettes automatically for odd masks even, which would be a neato
thing to have in there, as SDL never did this before.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401058
2005-05-16 05:34:58 +00:00
Sam Lantinga
00bc47ce3e *** empty log message ***
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401057
2005-05-16 04:45:07 +00:00
Sam Lantinga
18ce83733a *** empty log message ***
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401056
2005-05-08 19:58:34 +00:00
Patrice Mandin
ff6867e4dd Add support for ARAnyM Atari emulator
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401055
2005-05-05 10:52:22 +00:00
Ryan C. Gordon
1af9c2a12a Patched to compile again on x86 systems that use the assembly blitters.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401054
2005-04-20 05:57:39 +00:00
Ryan C. Gordon
8907a054cf Some work on using accelerated alpha blits with hardware surfaces.
From Stephane Marchesin's fork, don't know who originally wrote it.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401053
2005-04-17 10:40:41 +00:00
Ryan C. Gordon
ec77fa9503 SDL_CDOpen() fails on Linux if data track on disc is mounted in the
filesystem. Removing O_EXCL from open() call fixes this.

Problem and solution noted by "Fosters":
 http://www.libsdl.org/pipermail/sdl/2005-March/068028.html

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401052
2005-04-17 10:36:03 +00:00
Ryan C. Gordon
901515a5d4 Holding down shift while moving the mouse's scrollwheel on MacOS X makes the
OS report these are "horizontal scrollwheel" events, which confuses gaming
 apps in several legitimate conditions. Now all scrollwheel events are made
 to look vertical when passed to the app.

Patch by John Knottenbelt.

 http://www.libsdl.org/pipermail/sdl/2005-March/067978.html

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401051
2005-04-17 10:32:41 +00:00
Ryan C. Gordon
fa85ee1b48 Mixer: Visual C MMX asm code now aligns loops to 16 bytes.
This patch came from Stephane Marchesin's codefork, but I don't know who
 wrote it originally.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401050
2005-04-17 10:27:00 +00:00
Ryan C. Gordon
3ef0f4eccd Fixed direction key input on WinCE devices, thanks to
cal-at-splitreflection-com.

http://www.libsdl.org/pipermail/sdl/2005-April/068072.html

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401049
2005-04-17 10:23:58 +00:00
Ryan C. Gordon
48c21b291e Altivec-optimized blitters!
Vast majority of this work is compliments of Bob Ippolito.

http://www.devolution.com/pipermail/sdl/2005-February/067466.html and many
 other posts.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401048
2005-04-17 10:19:22 +00:00
Ryan C. Gordon
20dbe0d931 Added some parentheses for a little more macro safety. Recommended by Petri
Kero, here: http://www.devolution.com/pipermail/sdl/2005-March/067630.html

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401047
2005-04-17 10:16:30 +00:00
Patrice Mandin
dc6bb60504 Release CPU when waiting
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401046
2005-04-01 15:19:26 +00:00
Patrice Mandin
ea3ab2c3d9 Optimize also for 68020 and higher CPUs
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401045
2005-03-30 12:38:03 +00:00
Patrice Mandin
1b3ddcd400 Disable debug code
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401044
2005-03-07 10:09:21 +00:00
Patrice Mandin
5c6b522728 Dynamically create list of video modes, easier to add new ones
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401043
2005-03-07 10:00:58 +00:00
Patrice Mandin
ef3a6ed144 Was using width of surface instead of pitch to calculate length of surface width in words
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401042
2005-03-02 17:17:26 +00:00
Patrice Mandin
9681f989b4 Preliminary support for Blowup and Screen Blaster 3 extensions on Atari Falcon 030
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401041
2005-02-22 17:57:40 +00:00
Ryan C. Gordon
8556c7d396 Added testblitspeed to aid in profiling of SDL's blitters.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401040
2005-02-15 11:50:33 +00:00
Sam Lantinga
21243fbeb6 Ugly hack to make this work with gcc 2.x and 3.x
Thanks to Stephane Marchesin for the dirty dirty work.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401039
2005-02-13 07:10:02 +00:00
Sam Lantinga
b359512630 Date: Tue, 01 Feb 2005 17:53:07 -0800
From: Bill May
Subject: [SDL] Diffs for dsp audio in case of failures.

The rewrite recently done for 1.2.8 forgot to handle error cases
by closing the audio.

Here is a patch that does.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401038
2005-02-12 19:39:08 +00:00
Sam Lantinga
999b432dc5 [SDL] [PATCH] fix FB_VideoQuit for ia64
Jesse Barnes
Fri Jan 14 11:13:54 PST 2005

I noticed that on my ia64 machine when SDL_Quit was called, the machine would
hang in weird ways.  It turned out to be caused by a machine check in the
memset() call near the top of FB_VideoQuit.  Generally memset shouldn't be
used on I/O regions like the framebuffer or other I/O device memory (the
Linux kernel has special routines for dealing with I/O memory), so I changed
the #ifdef __powerpc__ to #if defined(__powerpc__) || defined(__ia64__) and
SDL_Quit now works properly.  The change should probably be made
unconditional though since doing one byte at a time is the only way to be
portable, afaik.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401037
2005-02-12 18:03:54 +00:00
Sam Lantinga
a0f696ddfa Date: Wed, 26 Jan 2005 13:37:09 GMT
From: Peter Naulls
Subject: RISC OS SDL Patches

Sam, I've attached a diff of the latest changes to libSDL for RISC OS
support.  These changes are by Alan Buckley and myself.

The most significant of these are:

  Optimised assembler blit rountines - I've attached the file
   src/video/riscos/SDL_riscosASM.s which is needed for this.

  Move to using /dev/dsp instead of its own audio implementation.
  This means that src/audio/riscos/SDL_drenderer.c should be removed

  Typo fixes.  Mainly correct spelling of "RISC OS", but some from elsewhere
  too.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401036
2005-02-12 18:01:31 +00:00
Patrice Mandin
3a0261fdf5 clear convert.buf before filling it
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401035
2005-01-29 09:58:40 +00:00
Sam Lantinga
87be6195cd The fix is going back in. :)
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401034
2005-01-25 17:58:44 +00:00
Sam Lantinga
b98f9d6fcf Date: Mon, 24 Jan 2005 21:37:56 +0800
From: Chris Taylor
Subject: Patch to put back dynamic OpenGL loading for MPW

I sent a patch a while ago that removes dynamic OpenGL loading for
Macintosh Programmer's Workshop. Dynamic loading DOES actually work
when an SDL program is built with MPW, it just has to be set up for it.
(Whoops!!) This is the ideal way to get OpenGL extensions to work,
which D2X uses quite a few of.

This patch puts dynamic loading back in SDL for Mac OS 9. It applies to
current CVS. I noticed that two members need to be set when
DrawSprocket is used.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401033
2005-01-25 16:57:11 +00:00
Sam Lantinga
b56b326a42 Date: Sun, 16 Jan 2005 19:20:15 +0100
From: Stephane Marchesin
To: Kirill Ponomarew
Subject: [SDL] Problem on x86_64 with latest CVS (Re: sdl12 with gcc-2.95)

>-I../../src -I../../src/main/freebsd -I../../src/audio
>-I../../src/video -I../../src/video/XFree86/extensions
>-I../../src/events -I../../src/joystick -I../../src/cdrom
>-I../../src/thread -I../../src/timer -I../../src/endian
>-I../../src/file -I../../src/thread -MT SDL_endian.lo -MD -MP -MF
>.deps/SDL_endian.Tpo -c SDL_endian.c  -fPIC -DPIC -o
>.libs/SDL_endian.o
>{standard input}: Assembler messages:
>{standard input}:144: Error: suffix or operands invalid for `xchg'
>*** Error code 1
>
That's a totally different problem. This was introduced in CVS 4 days ago :
http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/include/SDL_endian.h.diff?r1=1.11\
&r2=1.12

Just revert this patch.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401032
2005-01-18 18:40:48 +00:00
Sam Lantinga
0d9f27d255 Date: Sat, 15 Jan 2005 15:06:01 -0600
From: Tyler Montbriand
Subject: [SDL] minor bugfix for test/testoverlay2.c

Programs that use malloc ought to #include <stdlib.h> .  On 32-bit systems you
can get away with not including it, but on 64-bit systems it will assume
malloc() returns a 32-bit integer and butcher the 64-bit pointers it returns.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401031
2005-01-18 18:32:10 +00:00
Ryan C. Gordon
df4b061868 Date: Mon, 17 Jan 2005 20:54:50 +0200
From: Ville [snip]
Subject: [PATCH] SDL/DirectFB: remove Matrox CRTC2 flicker filter

Hi,

This patch removes the flicker filter option from the DirectFB backend's
Matrox CRTC2 code in SDL. I will be removing the option from DirectFB
(because it doesn't actually work) and that would cause the SDL code to
fail without this fix.

I was going to send this to some SDL list directly but libsdl.org is down
so I'm not sure what if any lists there are. Thomas Jarosch (the guy who
wrote the code) said you would accept SDL patches. Let me know if I should
send this somewhere else.

-- Ville Syrj�l� syrjala _at sci.fi http://www.sci.fi/~syrjala/

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401030
2005-01-17 19:38:28 +00:00