Update to v4.2.3.1

aclocal.m4

@@ -193,7 +193,6 @@ dnl
 dnl Variables:
 dnl  allegro_sv_procfs=(yes|no)
 dnl
-AC_MSG_CHECKING(for System V sys/procfs)
 AC_DEFUN(ALLEGRO_ACTEST_SV_PROCFS, [
   AC_CHECK_HEADER(sys/procfs.h, [
     AC_TRY_COMPILE(
@@ -209,15 +208,13 @@ AC_DEFUN(ALLEGRO_ACTEST_SV_PROCFS, [
     [allegro_sv_procfs=no]
   ])
 ])
-AC_MSG_RESULT($allegro_sv_procfs)
 
 dnl
 dnl Test if sys/procfs.h tells us argc/argv.
 dnl
 dnl Variables:
 dnl  allegro_procfs_argcv=(yes|no)
 dnl
-AC_MSG_CHECKING(if sys/procfs.h tells us argc/argv)
 AC_DEFUN(ALLEGRO_ACTEST_PROCFS_ARGCV, [
   AC_TRY_COMPILE(
     [#include  <sys/procfs.h>],
@@ -226,21 +223,18 @@ AC_DEFUN(ALLEGRO_ACTEST_PROCFS_ARGCV, [
     [allegro_procfs_argcv=no]
   )
 ])
-AC_MSG_RESULT($allegro_procfs_argcv)
 
 dnl
 dnl Test for getexecname() on Solaris
 dnl
 dnl Variables:
 dnl  allegro_sys_getexecname=(yes|no)
 dnl
-AC_MSG_CHECKING(for getexecname)
-AC_DEFUN(ALLEGRO_ACTEST_SYS_GETEXECNAME,
-   [AC_CHECK_LIB(c, getexecname,
+AC_DEFUN(ALLEGRO_ACTEST_SYS_GETEXECNAME, [
+  AC_CHECK_LIB(c, getexecname,
       [allegro_sys_getexecname=yes],
-      [allegro_sys_getexecname=no])]
-)
-AC_MSG_RESULT($allegro_sys_getexecname)
+      [allegro_sys_getexecname=no])
+])
 
 dnl
 dnl Test for X-Windows support.

docs/src/allegro._tx

@@ -18,7 +18,7 @@
 @document_title=Allegro Manual
 @html_footer=Back to contents
 @rtfh=Allegro - a game programming library
-@manh="version 4.2.2 (SVN)" "Allegro" "Allegro manual"
+@manh="version 4.2.3" "Allegro" "Allegro manual"
 @mans=#include <allegro.h>
 @man_shortdesc_force1=allegro
 @man_shortdesc_force2=Allegro game programming library.
@@ -52,12 +52,12 @@
        \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 	\/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 				       /\____/
-				       \_/__/     Version 4.2.2 (SVN)
+				       \_/__/     Version 4.2.3
 
 
 		A game programming library.
 
-	     By Shawn Hargreaves, Nov 26, 2006.
+	     By Shawn Hargreaves, Oct 29, 2009.
 
 		See the AUTHORS file for a
 	       complete list of contributors.
@@ -1849,13 +1849,10 @@ your game.
 @xref Standard config variables, set_config_string, get_config_string
 @eref exconfig
 @shortdesc Sets the configuration file.
-   Sets the configuration file to be used by all subsequent config 
-   functions. If you don't call this function, Allegro will use the default 
-   `allegro.cfg' file, looking first in the same directory as your program
-   and then in the directory pointed to by the ALLEGRO environment variable
-   and the usual platform-specific paths for configuration files. For example
-   it will look for `/etc/allegro.cfg' under Unix.
-
+   Sets the configuration file to be used by all subsequent config
+   functions. (Allegro will not search for this file in other locations
+   as it does with allegro.cfg at the time of initialization.)
+
    All pointers returned by previous calls to get_config_string() and
    other related functions are invalidated when you call this function!
    You can call this function before install_allegro() to change the
@@ -10303,6 +10300,16 @@ any character, but only one).
    or `/' on to it (depending on the platform). Note: ignore the function
    name, it's out of date.
 
+@@void @set_filename_encoding(int encoding)
+@xref get_filename_encoding
+@shortdesc Sets the encoding to use for filenames.
+   Sets the encoding to use for filenames. By default, UTF-8 is assumed.
+
+@@int @get_filename_encoding(void)
+@xref set_filename_encoding
+@shortdesc Returns the encoding currently assumed for filenames.
+   Returns the encoding currently assumed for filenames.
+
 @@int @file_exists(const char *filename, int attrib, int *aret);
 @xref exists, file_size_ex, file_time
 @shortdesc Tells if a file exists.

docs/src/build/mingw32._tx

@@ -411,6 +411,10 @@ Using Allegro
    the statically linked Allegro libraries are post-fixed with '<tt>_s</tt>' so that
    you will link with either <tt>liballeg_s.a</tt>, <tt>liballd_s.a</tt> or <tt>liballp_s.a</tt>.
 
+   When using a no-ASM library (built with <tt>ALLEGRO_USE_C</tt> option), you must define the
+   preprocessor symbol <tt>ALLEGRO_NO_ASM</tt> before including any of the Allegro headers. The
+   names of the no-ASM libraries are post-fixed with '<tt>_c</tt>'.
+
    Don't forget that you need to use the <code>END_OF_MAIN()</code> macro right after
    your <code>main()</code> function.
 

docs/src/build/msvc._tx

@@ -253,6 +253,10 @@ Using Allegro
       alleg_s_crt.lib - statically linked optimised library 
                            with the static C runtime
 <endblock>
+   All above library configurations could be built with <tt>ALLEGRO_USE_C</tt> option which
+   would add a "_c" suffix to them. When linking your program to such a library, you must define
+   the preprocessor symbol <tt>ALLEGRO_NO_ASM</tt> before including any of the Allegro headers.
+
    When using a statically linked library, you must define the preprocessor
    symbol <tt>ALLEGRO_STATICLINK</tt> before including any of the Allegro headers and
    link your program against Allegro and the main Win32/DirectX libraries

docs/src/changes._tx

@@ -7,6 +7,44 @@
 @document_title=Allegro Changes
 @html_spaced_list_bullet
 
+@heading
+Changes from 4.2.3 to 4.2.3.1 (October 2009)
+<ul><li>
+   Francis Devereux made the OS X port compile on Mac OS X 10.6.
+</ul>
+
+@heading
+Changes from 4.2.2 to 4.2.3 (October 2009)
+<ul><li>
+   Fix fnstsw compile bug with newer binutils.
+<li>
+   Trent Gamblin made a small change to the Windows mouse driver to add
+   support for touchscreens (at least 1 of them).
+<li>
+   Peter De Wachter made the ALSA driver work for hardware which does not
+   support unsigned samples.
+<li>
+   Matthew Leverton fixed a problem with filename encoding and the SYSTEM_NONE
+   driver.  Added set_filename_encoding(), get_filename_encoding().
+<li>
+   Milan Mimica made the MinGW and MSVC makefiles add the suffix "_c" onto
+   non-asm builds, and clarified that user programs linking against the
+   non-asm libraries must also defined ALLEGRO_USE_C.  Mixing calling
+   conventions causes segfaults when functions are inlined.
+<li>
+   AJ added detection for SSSE3, SSE4.1 and SSE4.2
+<li>
+   David A. Capello made key_shifts work properly on Windows for Control,
+   Alt, and Shift.
+<li>
+   Clarified that set_config_file() does not search for the given config file
+   in other locations, as Allegro does with allegro.cfg at initialization.
+<li>
+   Fixed buffer overflow in exgui.
+<li>
+   Fixed problems with newer versions of autoconf.
+</ul>
+
 @heading
 Changes from 4.2.2 RC1 to 4.2.2 (July 2007)
 <ul><li>

docs/src/faq._tx

@@ -748,7 +748,7 @@ General problems
 @@   How can I convert the documentation into Windows Help format?
 
       You need to download the makertf conversion utility 
-      (<link>ftp://ftp.coast.net/Coast/win3/winhelp/mkrtf104.zip</a>), and the Windows 
+      (<link>http://www.giffer.com/public/win/pwflemgt/Files/MKRTF104.ZIP</a>), and the Windows 
       Help compiler (<link>ftp://ftp.microsoft.com/Softlib/MSLFILES/HC505.EXE</a>). 
       Make a temporary directory, copy the <code>allegro.txi</code> file from the 
       <code>allegro/docs</code> dir, and run the commands <tt>makertf --no-warn allegro.txi 

docs/src/readme._tx

@@ -30,12 +30,12 @@
        \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 	\/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 				       /\____/
-				       \_/__/     Version 4.2.2 (SVN)
+				       \_/__/     Version 4.2.3
 
 
 		A game programming library.
 
-	     By Shawn Hargreaves, Nov 26, 2006.
+	     By Shawn Hargreaves, Oct 29, 2009.
 
 		See the AUTHORS file for a
 	       complete list of contributors.

docs/src/thanks._tx

@@ -328,6 +328,9 @@ Contributors
    Fabrizio Gennari (<email>[email protected]</a>).<br>
    Contributed the DB9 and TurboGraFXoystick drivers.
 
+   Francis Devereux.<br>
+   Made the OS X port compile on Mac OS X 10.6.
+
    Francisco Pires (<email>[email protected]</a>).<br>
    Added an FPS counter and an option to disable vsync to the excamera
    example.
@@ -833,6 +836,10 @@ Contributors
    mapping, optimised the alpha sprite blending routines and added non-ASCII
    space recognition to uisspace().
 
+   Peter De Wachter.<br>
+   Made the ALSA driver work for hardware which does not support unsigned
+   samples.
+
    Peter Hull (<email>[email protected]</a>).<br>
    Made the file selector work with directories that have more than 2048 
    files, solved some compiling issues on MacOS X, fixed a bug in rest() 

examples/exflame.c

@@ -128,6 +128,9 @@ int main(void)
 	 }
       }
       release_screen();
+
+      /* Hack to make sure keyboard input is noticed. */
+      rest(0);
    }
 
    clear_keybuf();
@@ -170,6 +173,9 @@ int main(void)
 
       bmp_unwrite_line(screen);
       release_screen();
+
+      /* Hack to make sure keyboard input is noticed. */
+      rest(0);
    }
 
    clear_keybuf();
@@ -209,6 +215,9 @@ int main(void)
 
       bmp_unwrite_line(screen);
       release_screen();
+
+      /* Hack to make sure keyboard input is noticed. */
+      rest(0);
    }
 
    free(temp);

examples/exgui.c

@@ -31,7 +31,7 @@ char the_text[] =
    "word wrap the text.";
 
 /* for the multiple selection list */
-char sel[10];
+char sel[11];
 
 /* for the example bitmap */
 DATAFILE *datafile;

include/allegro/alcompat.h

@@ -220,6 +220,20 @@ AL_INLINE_DEPRECATED(void, yield_timeslice, (void),
 /* DOS-ish monitor retrace ideas that don't work elsewhere */
 AL_FUNCPTR(void, retrace_proc, (void));
 
+
+/* Those were never documented, but we need to keep them for DLL compatibility,
+ * and to be on the safe side also let's keep them work regardless.
+ */
+AL_INLINE_DEPRECATED(void, set_file_encoding, (int encoding),
+{
+   set_filename_encoding(encoding);
+})
+AL_INLINE_DEPRECATED(int, get_file_encoding, (void),
+{
+   return get_filename_encoding();
+})
+
+
 #ifdef ALLEGRO_LIB_BUILD
    AL_FUNC(int,  timer_can_simulate_retrace, (void));
    AL_FUNC(void, timer_simulate_retrace, (int enable));

include/allegro/base.h

@@ -46,10 +46,10 @@
 
 #define ALLEGRO_VERSION          4
 #define ALLEGRO_SUB_VERSION      2
-#define ALLEGRO_WIP_VERSION      2
-#define ALLEGRO_VERSION_STR      "4.2.2"
-#define ALLEGRO_DATE_STR         "2007"
-#define ALLEGRO_DATE             20070722    /* yyyymmdd */
+#define ALLEGRO_WIP_VERSION      3
+#define ALLEGRO_VERSION_STR      "4.2.3"
+#define ALLEGRO_DATE_STR         "2009"
+#define ALLEGRO_DATE             20091029    /* yyyymmdd */
 
 /*******************************************/
 /************ Some global stuff ************/

include/allegro/file.h

@@ -138,10 +138,10 @@ struct PACKFILE_VTABLE
 };
 
 
-#define uconvert_tofilename(s, buf)      uconvert(s, U_CURRENT, buf, get_file_encoding(), sizeof(buf))
+#define uconvert_tofilename(s, buf)      uconvert(s, U_CURRENT, buf, get_filename_encoding(), sizeof(buf))
 
-AL_FUNC(void, set_file_encoding, (int encoding));
-AL_FUNC(int, get_file_encoding, (void));
+AL_FUNC(void, set_filename_encoding, (int encoding));
+AL_FUNC(int, get_filename_encoding, (void));
 
 AL_FUNC(void, packfile_password, (AL_CONST char *password));
 AL_FUNC(PACKFILE *, pack_fopen, (AL_CONST char *filename, AL_CONST char *mode));

include/allegro/internal/aintern.h

@@ -126,6 +126,8 @@ AL_FUNC(int, _al_drive_exists, (int drive));
 AL_FUNC(int, _al_getdrive, (void));
 AL_FUNC(void, _al_getdcwd, (int drive, char *buf, int size));
 
+AL_FUNC(void, _al_detect_filename_encoding, (void));
+
 /* obsolete; only exists for binary compatibility with 4.2.0 */
 AL_FUNC(long, _al_file_size, (AL_CONST char *filename));
 

include/allegro/platform/aintunix.h

@@ -74,11 +74,6 @@ extern "C" {
    AL_FUNC(void, _unix_register_digi_driver, (int id, DIGI_DRIVER *driver, int autodetect, int priority));
    AL_FUNC(void, _unix_register_midi_driver, (int id, MIDI_DRIVER *driver, int autodetect, int priority));
 
-
-   /* File system helpers */
-   AL_FUNC(void, _unix_guess_file_encoding, (void));
-
-
    /* Get size of a memory page in bytes */
    AL_FUNC(size_t, _unix_get_page_size, (void));
 

include/allegro/system.h

@@ -110,6 +110,9 @@ AL_FUNC(void, check_cpu, (void));
 #define CPU_AMD64    0x0200
 #define CPU_IA64     0x0400
 #define CPU_SSE3     0x0800
+#define CPU_SSSE3    0x1000
+#define CPU_SSE41    0x2000
+#define CPU_SSE42    0x4000
 
 /* CPU families - PC */
 #define CPU_FAMILY_UNKNOWN  0

makefile.all

@@ -15,7 +15,7 @@
 #                           to *NOT* be backwards compatible (GCC-based platforms, MSVC).
 #        TARGET_OPTS        allows you to customize general optimizations (GCC-based platforms).
 #        CROSSCOMPILE=1     cross-build under Linux (DJGPP, MinGW32).
-#        ALLEGRO_USE_C=1    use C drawing code instead of asm (GCC-based platforms).
+#        ALLEGRO_USE_C=1    use C drawing code instead of asm (GCC-based platforms, MSVC).
 #        UNIX_TOOLS=1       use Unix-like tools instead of DOS tools.
 #
 #     Targets: 

makefile.in

@@ -210,6 +210,9 @@ allegro_aintdos_h = $(srcdir)/include/allegro/platform/aintdos.h \
 obj_unix_asmdef_inc = $(OBJDIR)/asmdef.inc
 xalleg_h = $(srcdir)/include/xalleg.h
 
+# required to get asmdef.inc to be built automatically
+$(ALLEGRO_SRC_I386_FILES): $(obj_unix_asmdef_inc)
+
 ifdef CROSSCOMPILE
 
 $(OBJDIR)/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h
@@ -342,6 +345,11 @@ info:
 
 -include makefile.dep
 
+# required to fix parallel make builds, makes the lib targets a dependency of the exe targets
+# XXX this is a little bit of a hack. Ideally youd want only the debug exes to depend on the debug libs,
+# not all of them.
+$(ALLEGRO_EXE_TARGETS): $(ALLEGRO_LIB_TARGETS)
+
 ifdef CROSSCOMPILE
 
 full-build: lib modules programs