timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] alld40.dll,1.3,NONE alleg40.dll,1.4,NONE

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31186

Removed Files:
	alld40.dll alleg40.dll 
Log Message:


--- alleg40.dll DELETED ---

--- alld40.dll DELETED ---

[Timewarp-commit] source/other ttf.cpp,1.7,1.8

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30787/source/other

Modified Files:
	ttf.cpp 
Log Message:


Index: ttf.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/ttf.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ttf.cpp	11 Jul 2005 00:25:58 -0000	1.7
--- ttf.cpp	2 Jun 2006 14:55:52 -0000	1.8
***************
*** 389,393 ****
  		draw_transparent(bmp, g, x, y);
  	} else {
! 	    bmp->vtable->draw_character(bmp, g, x, y, fg);
  	}
  
--- 389,394 ----
  		draw_transparent(bmp, g, x, y);
  	} else {
! 		int bg = -1;
! 	    bmp->vtable->draw_character(bmp, g, x, y, fg, bg);
  	}
  

[Timewarp-commit] source/jgmod effectx.txt, NONE, 1.1 file_io.c, NONE, 1.1 file_io.h, NONE, 1.1 history.txt, NONE, 1.1 jgmod.c, NONE, 1.1 jgmod.h, NONE, 1.1 jgmod.txt, NONE, 1.1 jshare.h, NONE, 1.1 load_it.c, NONE, 1.1 load_jgm.c, NONE, 1.1 load_mod.c, NONE, 1.1 load_s3m.c, NONE, 1.1 load_xm.c, NONE, 1.1 makefile, NONE, 1.1 makefile.be, NONE, 1.1 makefile.dj, NONE, 1.1 makefile.lnx, NONE, 1.1 makefile.lst, NONE, 1.1 makefile.mgw, NONE, 1.1 makefile.vc, NONE, 1.1 mod.c, NONE, 1.1 port.h, NONE, 1.1 save_jgm.c, NONE, 1.1 tips.txt, NONE, 1.1 unreal.txt, NONE, 1.1

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/jgmod
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30656/source/jgmod

Added Files:
	effectx.txt file_io.c file_io.h history.txt jgmod.c jgmod.h 
	jgmod.txt jshare.h load_it.c load_jgm.c load_mod.c load_s3m.c 
	load_xm.c makefile makefile.be makefile.dj makefile.lnx 
	makefile.lst makefile.mgw makefile.vc mod.c port.h save_jgm.c 
	tips.txt unreal.txt 
Log Message:
adding jgmod directly cause jgmod depends on allegro, and its library isn't updated by anyone ... therefore, making it part of the source is most convenient.

--- NEW FILE: jgmod.c ---
/*   
 *
 *                _______  _______  __________  _______  _____ 
 *               /____  / / _____/ /         / / ___  / / ___ \
 *               __  / / / / ____ / //   // / / /  / / / /  / /
 *             /  /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ /
 *            /______/ /______/ /_/     /_/ /______/ /______/
 *
 *
 *
 *  Guan Foo Wah
 *  18, SS 17 / 1H
 *  47500 Subang Jaya 
 *  Selangor
 *  Malaysia *
 *
 *  The player. Just to demonstrate how JGMOD sounds.
 *  Also used by me for testing MODs. */


#include <stdio.h>
#include <time.h>
//#include <conio.h>
#include <allegro.h>
#include "jgmod.h"


#define font_color      7
#define bitmap_height   12
#define bitmap_width    440
#define starting_speed  100
#define starting_pitch  100

JGMOD *the_mod;
BITMAP *bitmap;

struct OLD_CHN_INFO
{
    int old_sample;
    int color;
}old_chn_info[MAX_ALLEG_VOICE];

int start_chn;
int end_chn;
int chn_reserved;
int cp_circle = TRUE;
int note_length = 130;
int note_relative_pos = 0;

void make_circle(int chn);
void clear_circle (void);
void print_header (void);

// -- Functions --------------------------------------------------------------
int main(int argc, char **argv)
{
    int index;
    int input_key;

    set_volume (255, -1);
    fast_loading = FALSE;
    enable_m15 = TRUE;
    enable_lasttrk_loop = TRUE;

    srand (time(0));
    allegro_init();
    install_timer();
    install_keyboard();
    text_mode (0);


    if (argc != 2)
        {
        allegro_message (

        "JGMOD %s player by %s\n"
        "Date : %s\n\n"
        "Syntax : jgmod filename\n"
        "\nThis program is used to play MOD files\n",
        JGMOD_VERSION_STR, JGMOD_AUTHOR, JGMOD_DATE_STR);
        return (1);
        }

    if (exists (argv[1]) == 0)
        {
        allegro_message ("Error : %s not found\n", argv[1]);
        return (1);
        }

    the_mod = load_mod (argv[1]);
    if (the_mod == null)
        {
        allegro_message ("%s\n", jgmod_error);
        return (1);
        }

    if (the_mod->no_chn > MAX_ALLEG_VOICE)
        chn_reserved = MAX_ALLEG_VOICE;
    else
        chn_reserved = the_mod->no_chn;

    start_chn = 0;
    end_chn = chn_reserved;
    if (end_chn > 33)
        end_chn = 33;

    reserve_voices (chn_reserved, -1);
    if (install_sound (DIGI_AUTODETECT, MIDI_NONE, null) < 0)
        {
        allegro_message("Error : Unable to initialize sound card\n");       
        return 1;
        }

    for (index=0; index<MAX_ALLEG_VOICE; index++)
        {
        old_chn_info[index].old_sample = -1;
        old_chn_info[index].color = 0;
        }

    bitmap = create_bitmap (bitmap_width, bitmap_height);
    if (bitmap == null)
        {
        allegro_message ("Error : Not enough memory\n");
        return (1);
        }

    if (install_mod (chn_reserved) < 0)
        {
        allegro_message ("Error : Unable to allocate %d voices\n", chn_reserved);
        return (1);
        }

    if (set_gfx_mode (GFX_AUTODETECT, 640, 480, 0,0) < 0)
        {
        allegro_message ("Unable to switch to 640 x 480 256 colors mode");
        return (1);
        }


    acquire_screen();
    print_header();
    release_screen();

    set_mod_speed (starting_speed);
    set_mod_pitch (starting_pitch);
    play_mod (the_mod, TRUE);
    if (mi.flag & XM_MODE)
        note_length = 180;
    else
        note_length = 140;

    while (is_mod_playing() == TRUE)
        {
        //acquire_screen();
        textprintf (screen, font, 0,36, font_color, "Tempo : %3d  Bpm : %3d  Speed : %3d%%  Pitch : %3d%% ", mi.tempo, mi.bpm, mi.speed_ratio, mi.pitch_ratio);
        textprintf (screen, font, 0,48, font_color, "Global volume : %2d  User volume : %2d ", mi.global_volume, get_mod_volume());
        textprintf (screen, font, 0,70, font_color, "%03d-%02d-%02d    ", mi.trk, mi.pos, mi.tick < 0 ? 0 : mi.tick);

        for (index=0; index<chn_reserved; index++)
            {
            if (old_chn_info[index].old_sample != ci[index].sample)
                old_chn_info[index].color = rand() % 68 + 32;

            old_chn_info[index].old_sample = ci[index].sample;
            }

        for (index=start_chn; index<end_chn; index++)
            {
            if (cp_circle == TRUE)
                make_circle(index);

            if ( (voice_get_position(voice_table[index]) >= 0) && (ci[index].volume >= 1) && (ci[index].volenv.v >= 1) && (voice_get_frequency(voice_table[index]) > 0) && (mi.global_volume > 0) )
                textprintf (screen, font, 0,82+(index-start_chn)*bitmap_height, font_color, "%2d: %3d %2d %6dHz %3d ", index+1, ci[index].sample+1, ci[index].volume,  voice_get_frequency(voice_table[index]), ci[index].pan);
                //textprintf (screen, font, 0,82+(index-start_chn)*bitmap_height, font_color, "%2d: %3d %2d %6dHz %3d %d %d", index+1, ci[index].sample+1, ci[index].volume,  voice_get_frequency(voice_table[index]), ci[index].pan, ci[index].volenv.v, ci[index].volenv.p);
            else
                textprintf (screen, font, 0,82+(index-start_chn)*bitmap_height, font_color, "%2d: %3s %2s %6sHz %3s  ", index+1, " --", "--",  " -----", "---"); 
                //textprintf (screen, font, 0,82+(index-start_chn)*bitmap_height, font_color, "%2d: %3d %2s %6sHz %3s ", index+1, ci[index].sample+1, "--",  " -----", "---"); 
                
            }

        //get the keyboard inputs
        if (keypressed())
            {
            input_key = readkey();

            if      ( (input_key >> 8) == KEY_LEFT )
                prev_mod_track();
            else if ( (input_key >> 8) == KEY_RIGHT )
                next_mod_track();
            else if ( (input_key >> 8) == KEY_PLUS_PAD || (input_key >> 8) == KEY_EQUALS )
                set_mod_volume ( get_mod_volume() + 5);
            else if ( (input_key >> 8) == KEY_MINUS_PAD || (input_key >> 8) == KEY_MINUS )
                set_mod_volume ( get_mod_volume() - 5);
            else if ( (input_key >> 8) == KEY_F1)
                set_mod_speed (mi.speed_ratio - 5);
            else if ( (input_key >> 8) == KEY_F2)
                set_mod_speed (mi.speed_ratio + 5);
            else if ( (input_key >> 8) == KEY_F3)
                set_mod_pitch (mi.pitch_ratio - 5);
            else if ( (input_key >> 8) == KEY_F4)
                set_mod_pitch (mi.pitch_ratio + 5);
            else if ( (input_key >> 8) == KEY_F5)
                note_length++;
            else if ( (input_key >> 8) == KEY_F6)
                {
                note_length--;
                if (note_length <= 0)
                    note_length = 1;
                }
            else if ( (input_key >> 8) == KEY_F7)
                {
                note_relative_pos -= 2;
                if (note_relative_pos < -300)
                    note_relative_pos = -300;
                }
            else if ( (input_key >> 8) == KEY_F8)
                {
                note_relative_pos += 2;
                if (note_relative_pos > 300)
                    note_relative_pos = 300;
                }
            else if ( (input_key >> 8) == KEY_R)
                play_mod (the_mod, TRUE);
            else if ( (input_key >> 8) == KEY_P)
                toggle_pause_mode ();
            else if ( (input_key >> 8) == KEY_DOWN)
                {
                if (chn_reserved > 33)
                    {
                    end_chn = start_chn + 33 + 1;
                    if (end_chn > chn_reserved)
                        end_chn = chn_reserved;

                    start_chn = end_chn - 33;                    
                    }
                }
            else if ( (input_key >> 8) == KEY_UP)
                {
                if (chn_reserved > 33)
                    {
                    start_chn--;
                    if (start_chn < 0)
                        start_chn = 0;

                    end_chn = start_chn + 33;
                    }
                }

            else if ( (input_key >> 8) == KEY_N)
                {
                if (cp_circle == TRUE)
                    {
                    cp_circle = FALSE;
                    clear_circle();
                    }
                else
                    cp_circle = TRUE;
                }

            else if ( (input_key >> 8) == KEY_ESC || (input_key >> 8) == KEY_SPACE )
                {
                stop_mod();
                destroy_mod (the_mod);
                return 0;
                }
            else if ( (input_key >> 8) == KEY_TILDE )
                print_header();
            }

        //release_screen();
        }

    return 0;
}
END_OF_MAIN();

void make_circle(int chn)
{
    int radius, xpos;

    clear_to_color (bitmap,0);

    if (voice_get_position(voice_table[chn]) >= 0 && ci[chn].volume >= 1
        && ci[chn].volenv.v >= 1 && voice_get_frequency(voice_table[chn]) > 0  && (mi.global_volume > 0))
        {
        radius = (ci[chn].volume / 13) + 2;

        if (mi.flag & XM_MODE)
            xpos = voice_get_frequency(voice_table[chn]) ;
        else
            xpos = voice_get_frequency(voice_table[chn]) * 8363 / ci[chn].c2spd;

        xpos /= note_length;
        xpos += note_relative_pos;
        if (xpos > 439)
            xpos = 439;
        else if (xpos < 0)
            xpos = 0;

        circlefill (bitmap, xpos, 5, radius, old_chn_info[chn].color);
        }

    blit (bitmap, screen, 0,0, 200, 79+(chn-start_chn)*bitmap_height,bitmap->w, bitmap->h);
}

void clear_circle (void)
{
    int chn;

    for (chn=0; chn< (the_mod->no_chn); chn++)
        {
        clear(bitmap);
        blit (bitmap, screen, 0,0, 200, 79+chn*bitmap_height,bitmap->w, bitmap->h);
        }
}

void print_header (void)
{
    clear(screen);
    textprintf (screen, font, 0,0, font_color,  "Song name   : %s", the_mod->name);
    textprintf (screen, font, 0,12, font_color, "No Channels : %2d  Period Type : %s  No Inst : %2d ", the_mod->no_chn, (the_mod->flag & LINEAR_MODE) ? "Linear" : "Amiga", the_mod->no_instrument);
    textprintf (screen, font, 0,24, font_color, "No Tracks   : %2d  No Patterns : %2d  No Sample : %2d ", the_mod->no_trk, the_mod->no_pat, the_mod->no_sample);
}

--- NEW FILE: makefile.be ---
####################################################
#                                                  #
#     JGMOD makefile by Guan Foo Wah               #
#                                                  #
#    modified version for Linux, by George Foot    #
#    and Henrik Stokseth                           #
#    Ported to BEOS by Angelo Mottola              #
#                                                  #
####################################################

CPLIBDEST = /boot/develop/lib/x86
CPINCDEST = /boot/develop/headers/cpp

OBJ_DIR = ../obj/be

LIB_DIR = ../lib/be
STATIC_LIB = $(LIB_DIR)/libjgmod.a


include makefile.lst

CFLAGS = -O3 -W -Wno-unused -Wall -mcpu=pentium -ffast-math -funroll-loops


all : $(OBJ_LIST) $(STATIC_LIB) jgmod jgm
	@echo Done. 
	@echo To compress the executables, type \`make compress\' now
	@echo To install the executables, type \`make install\' as root
	@echo Please read readme.txt

install:
	cp $(STATIC_LIB) $(CPLIBDEST)
	cp jgmod.h $(CPINCDEST)
	@echo Please read readme.txt

include ../obj/be/makefile.dep


$(OBJ_DIR)/%.o: %.c
	gcc $(CFLAGS) -o $@ -c $<


$(STATIC_LIB) : $(OBJ_LIST)
	ar rs $(STATIC_LIB) $(OBJ_LIST)

jgmod : jgmod.c $(STATIC_LIB)
	gcc jgmod.c -o jgmod -s -L../lib/be -ljgmod `allegro-config --libs`

jgm : jgm.c $(STATIC_NAME)
	gcc jgm.c -o jgm -s -L../lib/be -ljgmod `allegro-config --libs`


clean :
	rm $(OBJ_DIR)/*.o 
	rm $(STATIC_LIB)
	rm jgmod
	rm jgm


veryclean :
	rm $(OBJ_DIR)/*.o 
	rm $(STATIC_LIB)
	rm jgmod
	rm jgm
	rm $(CPLIBDEST)/libjgmod.so
	rm $(CPINCDEST)/jgmod.h


compress: jgmod jgm
    ifneq ($(DJP),)
	@$(DJP) jgmod jgm
	@echo Done. 
    else
	@echo No executable compressor found! This target requires either the
	@echo DJP or UPX utilities to be installed.
    endif
	@echo To install the executables, type \`make install\' as root
	@echo Please read readme.txt


--- NEW FILE: effectx.txt ---
MOD, S3M, XM, and IT uses different numbers to represent different commands.
JGMOD convert these different commands in to protracker like commands.
Command 0-15 are protracker effects. Others are S3M and XM extended commands.

Below are the list of JGMOD commands supported. As more it is supported
by JGMOD, I will update the list. This is good for my own reference and
maybe to you too.

Command
-------
-2      Note Off (XM)
-1      Note Cut (S3M)
 0      Arpeggio. (MOD, XM)
 1      Pitch slide up. (MOD)
 2      Pitch slide down. (MOD)
 3      Slide to note. (MOD, S3M, XM)
 4      Vibrato. (MOD, S3M)
 5      Slide to note + Volume slide. (MOD)
 6      Vibrato + volume slide. (MOD)
 7      Tremolo. (MOD, XM)
 8      Set panning.  (MOD, XM)
 9      Set sample offset. (MOD, S3M, XM)
10      Volume slide. (MOD)
11      Position Jump. (MOD, S3M, XM)
12      Set Volume. (MOD, XM)
13      Pattern Break. (MOD, S3M, XM)
14      Extended command. See below
15      Set tempo and bpm. (MOD, XM)

// new set of effects for S3M.
16      Set tempo. (S3M)
17      Volume slide. (S3M)
18      Porta Down. (S3M)
19      Porta Up. (S3M)
20      Tremor. (S3M)
21      S3M Arpeggio. (S3M)
22      Vibrato + Volume Slide. (S3M)
23      Portemento to note + volume slide. (S3M)
24      Multi Retrig. (S3M)
25      S3M tremolo. (S3M)
26      Set bpm. (S3M)
27      Fine vibrato. (S3M)
28      Set Global volume. (S3M, XM)
29      Set Panning. (S3M)

// new set of effects for XM
30      Pitch slide up (XM).
31      Pitch slide down (XM).
32      XM Slide to note + Volume slide. (XM)
33      XM Vibrato + Volume slide (XM)
34      XM Volume slide (XM).
35      Global Volume Slide(XM)
36      Key off(XM)
37      Set envelop position(XM)
38      Panning Slide(XM)
39      Extra fine slide up/down (XM)


Extended command
----------------
1       Fine pitch slide up. (MOD)
2       Fine pitch slide down. (MOD)
3       Set glissando. Not supported.
4       Set vibrato waveform. (MOD, S3M)
5       Set finetune. Not supported.
6       Loop pattern. (MOD, S3M, XM)
7       Set tremolo waveform. (MOD, S3M, XM)
8       Set 16 positon panning. (MOD, S3M)
9       Retrigger sample. (MOD, XM)
10      Fine volume slide up. (MOD)
11      Fine volume slide down. (MOD)
12      Cut sample. (MOD, S3M, XM)
13      Delay Sample. (MOD, S3M, XM)
14      Delay pattern. (MOD, S3M, XM)

// new extended effects for S3M and XM
16      Stereo Control (S3M)
17      Fine porta up (XM)
18      Fine porta down (XM)
19      Fine volume slide up (XM)
20      Fine volume slide down (XM)


Volume Colum Effects
--------------------
0x10 to 0x50    Set volume
0x60 to 0x6F    Volume Slide Down
0x70 to 0x7F    Volume Slide Up
0x80 to 0x8F    Fine volume slide down
0x90 to 0x9F    Fine volume slide up
0xA0 to 0xAF    Set vibrato Speed
0xB0 to 0xBF    Vibrato
0xC0 to 0xCF    Set Panning
0xD0 to 0xDF    Panning slide left
0xE0 to 0xEF    Panning slide right
0xF0 to 0xFF    Tone porta


--- NEW FILE: file_io.c ---
/*    
 *
 *                _______  _______  __________  _______  _____ 
 *               /____  / / _____/ /         / / ___  / / ___ \
 *               __  / / / / ____ / //   // / / /  / / / /  / /
 *             /  /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ /
 *            /______/ /______/ /_/     /_/ /______/ /______/
 *
 *
 *
 *  Guan Foo Wah
 *  18, SS 17 / 1H
 *  47500 Subang Jaya 
 *  Selangor
 *  Malaysia
 *
 *
 *  File IO routines. For portability reasons. */


#include <stdio.h>
#include <allegro.h>
#include "file_io.h"
#include "jgmod.h"

JGMOD_FILE *jgmod_fopen (char *filename, char *mode)
{
#ifdef JGMOD_PACKFILE
    return pack_fopen (filename, mode);
#else
    return fopen(filename, mode);
#endif
}


int jgmod_fclose (JGMOD_FILE *f)
{
#ifdef JGMOD_PACKFILE
    return pack_fclose (f);
#else
    return fclose (f);
#endif
}


void jgmod_fseek (JGMOD_FILE **f, char *filename, int offset)
{
#ifdef JGMOD_PACKFILE
    pack_fclose (*f);
    *f = pack_fopen (filename, "r");
    pack_fseek (*f, offset);
#else
    filename[0] = filename[0];
    fseek (*f, offset, SEEK_SET);
#endif
}


void jgmod_skip (JGMOD_FILE *f, int skip)
{
#ifdef JGMOD_PACKFILE
    pack_fseek (f, skip);
#else
    fseek (f, skip, SEEK_CUR);
#endif
}


int jgmod_fread (char *buf, int size, JGMOD_FILE *f)
{
#ifdef JGMOD_PACKFILE
    return pack_fread (buf, size, f);
#else
    return fread (buf, 1, size, f);
#endif
}


int jgmod_getc (JGMOD_FILE *f)
{
#ifdef JGMOD_PACKFILE
    return pack_getc (f);
#else
    return getc (f);
#endif
}


int jgmod_mgetw (JGMOD_FILE *f)
{
    int b1, b2;

    if ( (b1=jgmod_getc(f)) != EOF)
        if ( (b2=jgmod_getc(f)) != EOF)
            return ( (b1 << 8) + b2 );

    return EOF;
}


long jgmod_mgetl (JGMOD_FILE *f)
{
    long b1, b2, b3, b4;

    if ( (b1=jgmod_getc(f)) != EOF)
        if ( (b2=jgmod_getc(f)) != EOF)
            if ( (b3=jgmod_getc(f)) != EOF)
                if ( (b4=jgmod_getc(f)) != EOF)
                    return ( (b1 << 24) + (b2 << 16) + (b3 << 8) + b4 );

    return EOF;
}


int jgmod_igetw (JGMOD_FILE *f)
{
    int b1, b2;

    if ( (b1=jgmod_getc(f)) != EOF)
        if ( (b2=jgmod_getc(f)) != EOF)
            return ( (b2 << 8) + b1 );

    return EOF;
}


long jgmod_igetl (JGMOD_FILE *f)
{
    long b1, b2, b3, b4;

    if ( (b1=jgmod_getc(f)) != EOF)
        if ( (b2=jgmod_getc(f)) != EOF)
            if ( (b3=jgmod_getc(f)) != EOF)
                if ( (b4=jgmod_getc(f)) != EOF)
                    return ( (b4 << 24) + (b3 << 16) + (b2 << 8) + b1 );

    return EOF;
}


int jgmod_putc (int c, JGMOD_FILE *f)
{
#ifdef JGMOD_PACKFILE
    return pack_putc (c, f);
#else
    return putc (c, f);
#endif
}


int jgmod_iputw (int w, JGMOD_FILE *f)
{
    int b1, b2;

    b1 = (w & 0xFF00) >> 8;
    b2 = (w & 0xFF);

   if (jgmod_putc(b2,f)==b2)
      if (jgmod_putc(b1,f)==b1)
         return w;

    return EOF;
}


long jgmod_iputl (long l, JGMOD_FILE *f)
{
    int b1, b2, b3, b4;

    b1 = (long)((l & 0xFF000000L) >> 24);
    b2 = (long)((l & 0x00FF0000L) >> 16);
    b3 = (long)((l & 0x0000FF00L) >> 8);
    b4 = (long)l & 0x00FF;

    if (jgmod_putc(b4,f)==b4)
        if (jgmod_putc(b3,f)==b3)
            if (jgmod_putc(b2,f)==b2)
                if (jgmod_putc(b1,f)==b1)
                    return l;

   return EOF;
}


int jgmod_fwrite (void *buf, int size, JGMOD_FILE *f)
{
#ifdef JGMOD_PACKFILE
    return pack_fwrite (buf, size, f);
#else
    return fwrite (buf, sizeof(char), size, f);
#endif
}

--- NEW FILE: makefile.dj ---
####################################################
#                                                  #
#     JGMOD makefile by Guan Foo Wah               #
#                                                  #
####################################################

LIBDEST = $(DJDIR)/lib
INCDEST = $(DJDIR)/include
CPLIBDEST = $(subst /,\,$(DJDIR)/lib)
CPINCDEST = $(subst /,\,$(DJDIR)/include)

OBJ_DIR = ../obj/djgpp

LIB_DIR = ../lib/djgpp
LIB_NAME = $(LIB_DIR)/libjgmod.a

include makefile.lst

CFLAGS = -O3 -W -Wno-unused -Wall -mcpu=pentium -ffast-math -fomit-frame-pointer -funroll-loops

#detect if UPX or DJP exe compressor is present
ifneq ($(wildcard $(DJDIR)/bin/upx.exe),)
DJP = $(DJDIR)/bin/upx.exe
else
ifneq ($(wildcard $(DJDIR)/bin/djp.exe),)
DJP = $(DJDIR)/bin/djp.exe -s
endif
endif


all : $(OBJ_LIST) $(LIB_NAME) jgmod.exe jgm.exe
	copy $(subst /,\,$(LIB_DIR)/libjgmod.a) $(CPLIBDEST)
	copy jgmod.h $(CPINCDEST)
	@echo Done. 
	@echo To compress the exes, type make compress
	@echo Please read readme.txt


include ../obj/djgpp/makefile.dep


$(OBJ_DIR)/%.o: %.c
	gcc $(CFLAGS) -o $@ -c $<


$(LIB_NAME) : $(OBJ_LIST)
	ar rs $(LIB_NAME) $(OBJ_LIST)
	
jgmod.exe : jgmod.c jgmod.h $(LIB_NAME)
	gcc jgmod.c -o jgmod.exe -s $(LIB_NAME) -lalleg

jgm.exe : jgm.c jgmod.h port.h $(LIB_NAME)
	gcc jgm.c -o jgm.exe -s $(LIB_NAME) -lalleg


clean :
	del $(subst /,\,$(OBJ_DIR)/*.o)
	del $(subst /,\,$(LIB_NAME))
	del jgmod.exe 
	del jgm.exe


veryclean :
	del $(subst /,\,$(OBJ_DIR)/*.o)
	del $(subst /,\,$(LIB_NAME))
	del jgmod.exe 
	del jgm.exe
	del $(CPLIBDEST)\libjgmod.a 
	del $(CPINCDEST)\jgmod.h


compress: jgmod.exe jgm.exe
    ifneq ($(DJP),)
	@$(DJP) jgmod.exe jgm.exe
    else
	@echo No executable compressor found! This target requires either the
	@echo DJP or UPX utilities to be installed in your djgpp bin directory.
    endif

--- NEW FILE: load_jgm.c ---
/*
 *
 *                _______  _______  __________  _______  _____ 
 *               /____  / / _____/ /         / / ___  / / ___ \
 *               __  / / / / ____ / //   // / / /  / / / /  / /
 *             /  /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ /
 *            /______/ /______/ /_/     /_/ /______/ /______/
 *
 *
 *
 *  Guan Foo Wah
 *  18, SS 17 / 1H
 *  47500 Subang Jaya 
 *  Selangor
 *  Malaysia
 *
 *
 *  JGM loader. */

#include <stdio.h>
#include <string.h>
#include <allegro.h>
#include "jgmod.h"
#include "file_io.h"


#define JGM_SIG     "JGMOD 01 module : "

//#define JG_debug

void lock_mod (JGMOD *j);
int detect_jgm (char *filename);
JGMOD *load_jgm (JGMOD_FILE *f);
void *jgmod_calloc (int size);
int get_jgm_info(JGMOD_FILE *f, JGMOD_INFO *ji);


int detect_jgm (char *filename)
{
    char id[18];
    JGMOD_FILE *file;

    file = jgmod_fopen (filename, "rb");
    if (file == null)
        return -1;

    jgmod_fread (id, 18, file);
    jgmod_fclose(file);

    if (memcmp (id, JGM_SIG, 18) == 0)
        return 1;
    
    return -1;
}


int get_jgm_info(JGMOD_FILE *f, JGMOD_INFO *ji)
{
    ji->type = JGM_TYPE;
    sprintf (ji->type_name, "JGM");

    jgmod_skip (f, 18);
    jgmod_fread (ji->name, 29, f);
    return 1;
}


JGMOD *load_jgm (JGMOD_FILE *f)
{
    INSTRUMENT_INFO *ii;
    PATTERN_INFO *pi;
    SAMPLE_INFO *si;
    SAMPLE *s;
    JGMOD *j;
    int index;
    int head_no;
    int temp;
    int repeat;

    j = jgmod_calloc (sizeof (JGMOD) );
    if (j == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for JGMOD structure");
        return null;
        }
    
    jgmod_skip (f, 18);
    jgmod_fread (j->name, 28, f);
    jgmod_getc(f);
    jgmod_getc(f);
    j->no_trk = jgmod_igetw (f);
    j->no_pat = jgmod_igetw (f);
    j->no_chn = jgmod_igetw (f);
    j->no_instrument = jgmod_igetw (f);
    j->no_sample = jgmod_igetw (f);
    j->tempo = jgmod_igetw (f);
    j->bpm = jgmod_igetw (f);
    j->global_volume = jgmod_igetw (f);
    j->restart_pos = jgmod_igetw (f);
    j->flag = jgmod_igetw(f);

    for (index=0; index < j->no_chn; index++)
        j->panning[index] = jgmod_getc(f);

    for (index=0; index < j->no_trk; index++)
        j->pat_table[index] = jgmod_getc(f);

// -- loading instrument -----------------------------------------------------

    j->ii = jgmod_calloc (sizeof (INSTRUMENT_INFO) * j->no_instrument);
    if (j->ii == null)
        {
        destroy_mod (j);
        sprintf (jgmod_error, "Unable to allocate enough memory for INSTRUMENT_INFO");
        return null;
        }

    for (head_no=0; head_no < j->no_instrument; head_no++)
        {
        ii = j->ii + head_no;

        // load sample number for all notes
        for (index=0; index < 96; index++)
            ii->sample_number[index] = jgmod_getc (f);

        // load volume envelope points
        for (index=0; index < 12; index++)
            {
            ii->volpos[index] = jgmod_igetw(f);
            ii->volenv[index] = jgmod_igetw(f);
            }

        ii->no_volenv = jgmod_getc(f);
        ii->vol_type = jgmod_getc(f);
        ii->vol_susbeg = jgmod_getc(f);
        ii->vol_susend = ii->vol_susbeg;
        ii->vol_begin = jgmod_getc(f);
        ii->vol_end = jgmod_getc(f);


        // load panning envelope points
        for (index=0; index < 12; index++)
            {
            ii->panpos[index] = jgmod_igetw(f);
            ii->panenv[index] = jgmod_igetw(f);
            }

        ii->no_panenv = jgmod_getc(f);
        ii->pan_type = jgmod_getc(f);
        ii->pan_susbeg = jgmod_getc(f);
        ii->pan_susend = ii->pan_susbeg;
        ii->pan_begin = jgmod_getc(f);
        ii->pan_end = jgmod_getc(f);

        ii->volume_fadeout = jgmod_igetw(f);
        }

// -- loading samples --------------------------------------------------------

    j->s = jgmod_calloc (sizeof (SAMPLE) * j->no_sample);
    j->si = jgmod_calloc (sizeof (SAMPLE_INFO) * j->no_sample);

    if ( (j->s == null) || (j->si == null) )
        {
        destroy_mod (j);
        sprintf (jgmod_error, "Unable to allocate enough memory for SAMPLE or SAMPLE_INFO");
        return null;
        }

    for (head_no=0; head_no < j->no_sample; head_no++)
        {
        si = j->si + head_no;
        s = j->s + head_no;

        si->lenght = s->len = jgmod_igetl (f);
        s->freq = 1000;
        s->priority = JGMOD_PRIORITY;
        s->param = -1;
        #ifdef ALLEGRO_DATE
        s->stereo = FALSE;
        #endif

        if (s->len > 0)
            {
            si->repoff = s->loop_start = jgmod_igetl (f);
            si->replen = s->loop_end   = jgmod_igetl (f);
            si->vibrato_type = jgmod_getc (f);
            si->vibrato_spd = jgmod_getc (f);
            si->vibrato_depth = jgmod_getc (f);
            si->vibrato_rate = jgmod_getc (f);
            si->volume = jgmod_getc (f);
            si->pan = jgmod_getc (f);
            si->transpose = (signed char) jgmod_getc (f);
            si->c2spd = jgmod_igetw (f);
            s->bits = jgmod_getc (f);
            si->loop = jgmod_getc (f);

            s->data = jgmod_calloc (s->len * s->bits / 8);
            if (s->data == null)
                {
                destroy_mod (j);
                sprintf (jgmod_error, "Unable to allocate enough memory for sample data");
                return null;
                }

            jgmod_fread (s->data, s->len * s->bits / 8, f);
            }
        else
            {
            s->data = jgmod_calloc (0);
            if (s->data == null)
                {
                destroy_mod (j);
                sprintf (jgmod_error, "Unable to allcate enough memory for sample data");
                return null;
                }
            }
        }


// -- loading patterns --------------------------------------------------------
    j->pi = jgmod_calloc (sizeof(PATTERN_INFO) * j->no_pat);
    if (j->pi == null)
        {
        destroy_mod (j);
        sprintf (jgmod_error, "Unable to allocate enough memory for PATTERN_INFO");
        return null;
        }

    for (head_no=0; head_no < j->no_pat; head_no++)
        {
        pi = j->pi + head_no;

        pi->no_pos = jgmod_igetw (f);

        //printf ("%3d  =  %d\n", head_no, pi->no_pos);
        //readkey();

        pi->ni = jgmod_calloc (sizeof(NOTE_INFO) * j->no_chn * pi->no_pos);
        if (pi->ni == null)
            {
            destroy_mod (j);
            sprintf (jgmod_error, "Unable to allocate enough memory for NOTE_INFO");
            return null;
            }

        // load note first
        index=0;
        while (index < j->no_chn * pi->no_pos)
            {
            repeat = jgmod_getc (f);

            if (repeat & 0x80)
                for (temp =0; temp < (repeat & 0x7F); temp++)
                    {
                    if (j->flag & XM_MODE)
                        pi->ni[index + temp].note = (signed char)jgmod_getc (f);
                    else
                        {
                        pi->ni[index + temp].note = (signed short)jgmod_igetw (f);
                        if (pi->ni[index + temp].note > 0)
                            pi->ni[index + temp].note = NTSC / pi->ni[index + temp].note; 
                        }
                    }

            index += (repeat & 0x7F);
            }

        // now sample
        index=0;
        while (index < j->no_chn * pi->no_pos)
            {
            repeat = jgmod_getc (f);

            if (repeat & 0x80)
                for (temp =0; temp < (repeat & 0x7F); temp++)
                    pi->ni[index + temp].sample = jgmod_getc (f);

            index += (repeat & 0x7F);
            }

        // now volume
        index=0;
        while (index < j->no_chn * pi->no_pos)
            {
            repeat = jgmod_getc (f);

            if (repeat & 0x80)
                for (temp =0; temp < (repeat & 0x7F); temp++)
                    pi->ni[index + temp].volume = jgmod_getc (f);

            index += (repeat & 0x7F);
            }

        // now command
        index=0;
        while (index < j->no_chn * pi->no_pos)
            {
            repeat = jgmod_getc (f);

            if (repeat & 0x80)
                for (temp =0; temp < (repeat & 0x7F); temp++)
                    pi->ni[index + temp].command = jgmod_getc (f);

            index += (repeat & 0x7F);
            }

        // now extcommand
        index=0;
        while (index < j->no_chn * pi->no_pos)
            {
            repeat = jgmod_getc (f);

            if (repeat & 0x80)
                for (temp =0; temp < (repeat & 0x7F); temp++)
                    pi->ni[index + temp].extcommand = jgmod_igetw (f);

            index += (repeat & 0x7F);
             }
        }


#ifdef JG_debug

    for (index=0; index<j->no_pat; index++)
        {
        NOTE_INFO *ni;

        pi = j->pi + index;
        ni = pi->ni;


        printf ("\n\nPattern %d\n", index);
        for (temp=0; temp<(pi->no_pos * j->no_chn); temp++)
            {
            if ( (temp % j->no_chn) == 0 )
                printf ("\n");
                
            printf ("%06d %02d  ", ni->note, ni->sample);
           
            ni++;
            }

        }

#endif

    lock_mod (j);
    return (j);
}

--- NEW FILE: makefile.mgw ---
####################################################
#                                                  #
#     JGMOD makefile by Henrik Stokseth            #
#                                                  #
####################################################

CPLIBDEST = $(subst /,\,$(MINGDIR)/lib)
CPINCDEST = $(subst /,\,$(MINGDIR)/include)

OBJ_DIR = ../obj/mingw32

LIB_DIR = ../lib/mingw32
LIB_FILE = libjgmod.a
LIB_NAME = $(LIB_DIR)/$(LIB_FILE)

#check if MingW32 enviroment string is set
ifdef MINGDIR
MINGDIR_U = $(subst \,/,$(MINGDIR))
MINGDIR_D = $(subst /,\,$(MINGDIR))
else
badming:
	@echo Your MINGDIR environment variable is not set!
endif

NULLSTRING :=
SPACE := $(NULLSTRING) # special magic to get an isolated space character

ifneq ($(findstring $(SPACE),$(MINGDIR)),)
badspaces:
	@echo There are spaces in your MINGDIR environment variables:
	@echo please change these to the 8.3 short filename version,
	@echo or move your compiler to a different directory.
endif


include makefile.lst

CFLAGS = -O3 -W -Wno-unused -Wall -m486 -ffast-math -fomit-frame-pointer -funroll-loops
LFLAGS = -s


all : $(OBJ_LIST) $(LIB_NAME) winjgmod.exe winjgm.exe
	copy $(subst /,\,$(LIB_NAME)) $(MINGDIR_D)\lib
	copy jgmod.h $(MINGDIR_D)\include
	@echo Done. 
	@echo Please read readme.txt


include ..\obj\mingw32\makefile.dep

$(OBJ_DIR)/%.o: %.c
	gcc $(CFLAGS) -o $@ -c $<

$(LIB_NAME) : $(OBJ_LIST)
	ar rs $(LIB_NAME) $(OBJ_LIST)

winjgmod.exe: jgmod.c jgmod.h $(LIB_NAME)
	gcc $(LFLAGS) jgmod.c -o winjgmod.exe $(LIB_NAME) -lalleg

winjgm.exe: jgm.c jgmod.h $(LIB_NAME)
	gcc $(LFLAGS) jgm.c -o winjgm.exe $(LIB_NAME) -lalleg


clean :
	del $(subst /,\,$(OBJ_DIR)/*.o)
	del $(subst /,\,$(LIB_NAME))
	del winjgmod.exe 
	del winjgm.exe


veryclean :
	del $(subst /,\,$(OBJ_DIR)/*.o)
	del $(subst /,\,$(LIB_NAME))
	del winjgmod.exe 
	del winjgm.exe
	del $(MINGDIR_D)\lib\$(LIB_FILE)
	del $(MINGDIR_D)\include\jgmod.h

--- NEW FILE: jgmod.h ---
#ifndef JGMOD_H
#define JGMOD_H


#ifndef JGM_ID
    #define JGM_ID  DAT_ID('J','G','M',' ')
#endif

#ifndef null
#define null    0
#endif

#ifndef uchar
#define uchar   unsigned char
#endif

#ifndef ushort
#define ushort  unsigned short
#endif

#ifndef uint
#define uint    unsigned int
#endif

#ifndef NULL
#define NULL 0
#endif

#ifndef TRUE
#define TRUE -1
#endif

#ifndef FALSE
#define FALSE 0
#endif

#ifdef __cplusplus
extern "C" {
#endif

#define JGMOD_AUTHOR        "Guan Foo Wah"
#define JGMOD_VERSION       0
#define JGMOD_SUB_VERSION   99
#define JGMOD_VERSION_STR   "0.99"
#define JGMOD_DATE_STR      "15 October 2001"
#define JGMOD_DATE          20021015        /* yyyymmdd */

#define NTSC                3579546L
#define JGMOD_PRIORITY      192
#define MAX_ALLEG_VOICE     64
#define LOOP_OFF            0
#define LOOP_ON             1
#define LOOP_BIDI           2

#define ENV_ON              1
#define ENV_SUS             2
#define ENV_LOOP            4

#define XM_MODE             1
#define PERIOD_MODE         2
#define LINEAR_MODE         4


#define PTEFFECT_0          0
#define PTEFFECT_1          1
#define PTEFFECT_2          2
#define PTEFFECT_3          3
#define PTEFFECT_4          4
#define PTEFFECT_5          5
#define PTEFFECT_6          6
#define PTEFFECT_7          7
#define PTEFFECT_8          8
#define PTEFFECT_9          9
#define PTEFFECT_A          10
#define PTEFFECT_B          11
#define PTEFFECT_C          12
#define PTEFFECT_D          13
#define PTEFFECT_E          14
#define PTEFFECT_F          15

#define S3EFFECT_A          16
#define S3EFFECT_D          17
#define S3EFFECT_E          18
#define S3EFFECT_F          19
#define S3EFFECT_I          20
#define S3EFFECT_J          21
#define S3EFFECT_K          22
#define S3EFFECT_L          23
#define S3EFFECT_Q          24
#define S3EFFECT_R          25
#define S3EFFECT_T          26
#define S3EFFECT_U          27
#define S3EFFECT_V          28
#define S3EFFECT_X          29

#define XMEFFECT_1          30
#define XMEFFECT_2          31
#define XMEFFECT_5          32
#define XMEFFECT_6          33
#define XMEFFECT_A          34
#define XMEFFECT_H          35
#define XMEFFECT_K          36
#define XMEFFECT_L          37
#define XMEFFECT_P          38
#define XMEFFECT_X          39


//this is used in get_mod_info() function.
#define MOD15_TYPE          1
#define MOD31_TYPE          2
#define S3M_TYPE            3
#define XM_TYPE             4
#define IT_TYPE             5
#define JGM_TYPE            6
#define UNREAL_S3M_TYPE     7
#define UNREAL_XM_TYPE      8
#define UNREAL_IT_TYPE      9

//-- Header ------------------------------------------------------------------
typedef struct ENVELOPE_INFO
{
    int env[12];
    int pos[12];
    int flg;
    int pts;
    int loopbeg;
    int loopend;
    int susbeg;
    int susend;
    int a;
    int b;
    int p;
    int v;

}ENVELOPE_INFO;


typedef struct CHANNEL_INFO
{
    ENVELOPE_INFO volenv;
    ENVELOPE_INFO panenv;

    int instrument;
    int sample;
    int volume;
    int note;
    int period;
    int c2spd;
    int transpose;
    int pan;
    int kick;       // TRUE if sample needs to be restarted
    int keyon;
    int volfade;    // volume fadeout
    int instfade;   // how much volume to subtract from volfade

    int temp_volume;
    int temp_period;
    int temp_pan;

    int pan_slide_common;
    int pan_slide;
    int pan_slide_left;
    int pan_slide_right;

    int pro_pitch_slide_on;
    int pro_pitch_slide;
    int pro_fine_pitch_slide;
    int s3m_pitch_slide_on;
    int s3m_pitch_slide;
    int s3m_fine_pitch_slide;
    int xm_pitch_slide_up_on;
    int xm_pitch_slide_up;
    int xm_pitch_slide_down_on;
    int xm_pitch_slide_down;
    int xm_fine_pitch_slide_up;
    int xm_fine_pitch_slide_down;
    int xm_extra_fine_pitch_slide_up;
    int xm_x_up;
    int xm_x_down;

    int pro_volume_slide;
    int s3m_volume_slide_on;
    int s3m_fine_volume_slide;
    int s3m_volume_slide;
    int xm_volume_slide_on;
    int xm_volume_slide;
    int xm_fine_volume_slide_up;
    int xm_fine_volume_slide_down;

    int loop_on;
    int loop_times;
    int loop_start;

    int tremolo_on;
    int tremolo_waveform;
    char tremolo_pointer;
    int tremolo_speed;
    int tremolo_depth;
    int tremolo_shift;
    
    int vibrato_on;    
    int vibrato_waveform;
    char vibrato_pointer;
    int vibrato_speed;
    int vibrato_depth;
    int vibrato_shift;

    int slide2period_on;
    int slide2period_spd;
    int slide2period;

    int arpeggio_on;
    int arpeggio;

    int tremor_on;
    int tremor_count;
    int tremor_set;

    int delay_sample;
    int cut_sample;
    int glissando;
    int retrig;
    int s3m_retrig_on;
    int s3m_retrig;
    int s3m_retrig_slide;

    int sample_offset_on;
    int sample_offset;

    int global_volume_slide_on;
    int global_volume_slide;

}CHANNEL_INFO; 

typedef struct MUSIC_INFO
{
    int max_chn;
    int no_chn;

    int tick;
    int pos;
    int pat;
    int trk;
    int flag;

    int bpm;
    int tempo;
    int speed_ratio;
    int pitch_ratio;
    int global_volume;
    
    int new_pos;        // for pattern break
    int new_trk;        // or position jump
    int pattern_delay;  // pattern delay

    int skip_pos;       // for next_pattern
    int skip_trk;       // or prev_pattern
    int loop;           // replay the music if ended
    int pause;          // for pause function
    int forbid;
    int is_playing;

}MUSIC_INFO; 

typedef struct NOTE_INFO
{
    int sample;
    int note;
    int volume;
    int command;
    int extcommand;
}NOTE_INFO;


typedef struct SAMPLE_INFO
{
    int lenght;
    int c2spd;
    int transpose;
    int volume;
    int pan;
    int repoff;
    int replen;
    int loop;

    int vibrato_type;
    int vibrato_spd;
    int vibrato_depth;
    int vibrato_rate;

}SAMPLE_INFO;


typedef struct INSTRUMENT_INFO
{
    int sample_number[96];

    int volenv[12];
    int volpos[12];
    int no_volenv;
    int vol_type;
    int vol_susbeg;
    int vol_susend;
    int vol_begin;
    int vol_end;

    int panenv[12];
    int panpos[12];
    int no_panenv;
    int pan_type;
    int pan_susbeg;
    int pan_susend;
    int pan_begin;
    int pan_end;

    int volume_fadeout;

}INSTRUMENT_INFO;


typedef struct PATTERN_INFO
{
    NOTE_INFO *ni;
    int no_pos;
}PATTERN_INFO;

typedef struct JGMOD
{
    char name[29];
    SAMPLE_INFO *si;
    PATTERN_INFO *pi;
    INSTRUMENT_INFO *ii;
    SAMPLE *s;

    int no_trk;
    int no_pat;
    int pat_table[256];
    int panning[MAX_ALLEG_VOICE];
    int flag;

    int tempo;
    int bpm;

    int restart_pos;       
    int no_chn;
    int no_instrument;
    int no_sample;
    int global_volume;

}JGMOD;

typedef struct JGMOD_INFO
{
    int type;
    char type_name[20];
    char name[29];

}JGMOD_INFO;

//-- externs -----------------------------------------------------------------

extern JGMOD *of;
extern volatile MUSIC_INFO mi;
extern volatile int voice_table[];
extern volatile CHANNEL_INFO ci[MAX_ALLEG_VOICE];
extern volatile int mod_volume;
extern int fast_loading;
extern int enable_m15;
extern int enable_lasttrk_loop;
extern char jgmod_error[];

//-- Prototypes --------------------------------------------------------------
int install_mod(int no_voices);
void remove_mod (void);
JGMOD *load_mod (char *filename);
void mod_interrupt (void);
void play_mod (JGMOD *j, int loop);
void next_mod_track (void);
void prev_mod_track (void);
void goto_mod_track (int new_track);
void stop_mod (void);
int is_mod_playing (void);
void pause_mod (void);
void resume_mod (void);
int is_mod_paused (void);
void destroy_mod (JGMOD *j);
void set_mod_volume (int volume);
int get_mod_volume (void);
SAMPLE *get_jgmod_sample (JGMOD *j, int sample_no);
void set_mod_speed (int speed);
void set_mod_pitch (int pitch);
void toggle_pause_mode (void);
void register_datafile_jgmod(void);
void destroy_mod_datafile(void *j);
int get_mod_info (char *filename, JGMOD_INFO *ji);

#ifdef __cplusplus
}
#endif

#endif  // for JGMOD_H

--- NEW FILE: load_it.c ---
/*    
 *
 *                _______  _______  __________  _______  _____ 
 *               /____  / / _____/ /         / / ___  / / ___ \
 *               __  / / / / ____ / //   // / / /  / / / /  / /
 *             /  /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ /
 *            /______/ /______/ /_/     /_/ /______/ /______/
 *
 *
 *
 *  Guan Foo Wah
 *  18, SS 17 / 1H
 *  47500 Subang Jaya 
 *  Selangor
 *  Malaysia
 *
 *
 *  IT loader. Unfinished. But you can still keep dreaming on !! */

#include <stdio.h>
#include <string.h>
#include <allegro.h>
#include "jgmod.h"
#include "file_io.h"

//#define JG_debug
#define force_8_bit


JGMOD *load_it (char *filename, int start_offset);
int detect_unreal_it (char *filename);
int detect_it(char *filename);
int get_it_info(char *filename, int start_offset, JGMOD_INFO *ji);
void *jgmod_calloc (int size);

// to detect unreal IT files
int detect_unreal_it (char *filename)
{
    JGMOD_FILE *f;
    char id[4];
    int index;
    int start_offset = 0;

    f = jgmod_fopen (filename, "rb");
    if (f == null)
        return null;

    jgmod_fread (id, 4, f);
    if (memcmp (id, "Áƒ*ž", 4) != 0)    //detect a umx file
        {
        jgmod_fclose (f);
        return -1;
        }

    id[0] = jgmod_getc(f);
    id[1] = jgmod_getc(f);
    id[2] = jgmod_getc(f);
    id[3] = jgmod_getc(f);
    start_offset = 8;

    for (index=0; index<500; index++)
        {
        if (memcmp (id, "IMPM", 4) == 0)    //detect a S3M file
            return (start_offset - 4);

        id[0] = id[1];
        id[1] = id[2];
        id[2] = id[3];
        id[3] = jgmod_getc(f);
        start_offset++;        
        }

    return -1;
}


int detect_it(char *filename)
{
    JGMOD_FILE *f;
    char id[4];

    f =  jgmod_fopen (filename, "rb");
    if (f == null)
        return null;

    jgmod_fread (id, 4, f);
    if (memcmp (id, "IMPM", 4) == 0)    //detect successful
        return 1;

    jgmod_fclose (f);
    return -1;
}


int get_it_info(char *filename, int start_offset, JGMOD_INFO *ji)
{
    JGMOD_FILE *f;

    f = jgmod_fopen (filename, "rb");
    if (f == null)
        {
        sprintf (jgmod_error, "Unable to open %s", filename);
        return -1;
        }

    if (start_offset ==0)
        {
        sprintf (ji->type_name, "IT");
        ji->type = IT_TYPE;
        }
    else
        {
        sprintf (ji->type_name, "Unreal IT (UMX)");
        ji->type = UNREAL_IT_TYPE;
        }

    jgmod_skip (f, 4 + start_offset);
    jgmod_fread (ji->name, 26, f);
    jgmod_fclose (f);
    return 1;
}


JGMOD *load_it (char *filename, int start_offset)
{
    JGMOD_FILE *f;
    JGMOD *j;

    f =  jgmod_fopen (filename, "rb");
    if (f == null)
        return null;

    j = jgmod_calloc ( sizeof (JGMOD));
    if (j == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for JGMOD structure");
        jgmod_fclose (f);
        return null;
        }

    jgmod_skip (f, start_offset);
    jgmod_skip (f, 4);
    jgmod_fread (j->name, 26, f);
    jgmod_skip (f, 2);

    printf ("%s\n", j->name);



    sprintf (jgmod_error, "IT support is not completed yet. Wait a few more versions");
    jgmod_fclose (f);
    destroy_mod (j);
    return null;
}



--- NEW FILE: load_mod.c ---
/*   
 *
 *                _______  _______  __________  _______  _____ 
 *               /____  / / _____/ /         / / ___  / / ___ \
 *               __  / / / / ____ / //   // / / /  / / / /  / /
 *             /  /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ /
 *            /______/ /______/ /_/     /_/ /______/ /______/
 *
 *
 *
 *  Guan Foo Wah
 *  18, SS 17 / 1H
 *  47500 Subang Jaya 
 *  Selangor
 *  Malaysia
 *
 *
 *  Protracker 15 and 31 instruments loader. */

#include <string.h>
#include <stdio.h>
#include <allegro.h>
#include "jgmod.h"
#include "file_io.h"



typedef struct MODTYPE{    /* struct to identify type of module */
        char    id[5];
        char   no_channel;
} MODTYPE;

static MODTYPE modtypes[] = {
    {"M.K.", 4},     // protracker 4 channel
    {"M!K!", 4},     // protracker 4 channel
    {"FLT4", 4},     // startracker 4 channel
    {"1CHN", 1},     // fasttracker 1 channel
    {"2CHN", 2},     // fasttracker 2 channel
    {"3CHN", 3},     // fasttracker 3 channel 
    {"4CHN", 4},     // fasttracker 4 channel
    {"5CHN", 5},     // fasttracker 5 channel
    {"6CHN", 6},     // fasttracker 6 channel
    {"7CHN", 7},     // fasttracker 7 channel 
    {"8CHN", 8},     // fasttracker 8 channel
    {"9CHN", 9},     // fasttracker 9 channel 
    {"10CH", 10},    // fasttracker 10 channel
    {"11CH", 11},    // fasttracker 11 channel 
    {"12CH", 12},    // fasttracker 12 channel
    {"13CH", 13},    // fasttracker 13 channel
    {"14CH", 14},    // fasttracker 14 channel
    {"15CH", 15},    // fasttracker 15 channel
    {"16CH", 16},    // fasttracker 16 channel
    {"17CH", 17},    // fasttracker 17 channel
    {"18CH", 18},    // fasttracker 18 channel
    {"19CH", 19},    // fasttracker 19 channel
    {"20CH", 20},    // fasttracker 20 channel
    {"21CH", 21},    // fasttracker 21 channel
    {"22CH", 22},    // fasttracker 22 channel
    {"23CH", 23},    // fasttracker 23 channel 
    {"24CH", 24},    // fasttracker 24 channel
    {"25CH", 25},    // fasttracker 25 channel
    {"26CH", 26},    // fasttracker 26 channel
    {"27CH", 27},    // fasttracker 27 channel
    {"28CH", 28},    // fasttracker 28 channel
    {"29CH", 29},    // fasttracker 29 channel
    {"30CH", 30},    // fasttracker 30 channel
    {"31CH", 31},    // fasttracker 31 channel
    {"32CH", 32},    // fasttracker 32 channel
    {"33CH", 33},    // fasttracker 33 channel
    {"34CH", 34},    // fasttracker 34 channel
    {"35CH", 35},    // fasttracker 35 channel
    {"36CH", 36},    // fasttracker 36 channel
    {"37CH", 37},    // fasttracker 37 channel
    {"38CH", 38},    // fasttracker 38 channel
    {"39CH", 39},    // fasttracker 39 channel
    {"40CH", 40},    // fasttracker 40 channel
    {"41CH", 41},    // fasttracker 41 channel
    {"42CH", 42},    // fasttracker 42 channel
    {"43CH", 43},    // fasttracker 43 channel
    {"44CH", 44},    // fasttracker 44 channel
    {"45CH", 45},    // fasttracker 45 channel
    {"46CH", 46},    // fasttracker 46 channel
    {"47CH", 47},    // fasttracker 47 channel
    {"48CH", 48},    // fasttracker 48 channel
    {"49CH", 49},    // fasttracker 49 channel
    {"50CH", 50},    // fasttracker 50 channel
    {"51CH", 51},    // fasttracker 51 channel
    {"52CH", 52},    // fasttracker 52 channel
    {"53CH", 53},    // fasttracker 53 channel
    {"54CH", 54},    // fasttracker 54 channel
    {"55CH", 55},    // fasttracker 55 channel
    {"56CH", 56},    // fasttracker 56 channel
    {"57CH", 57},    // fasttracker 57 channel
    {"58CH", 58},    // fasttracker 58 channel
    {"59CH", 59},    // fasttracker 59 channel
    {"60CH", 60},    // fasttracker 60 channel
    {"61CH", 61},    // fasttracker 61 channel
    {"62CH", 62},    // fasttracker 62 channel
    {"63CH", 63},    // fasttracker 63 channel
    {"64CH", 64},    // fasttracker 64 channel
    {"CD81", 8},     // atari oktalyzer 8 channel
    {"OKTA", 8},     // atari oktalyzer 8 channel
    {"16CN", 16},    // taketracker 16 channel
    {"32CN", 32},    // taketracker 32 channel
    {"32FW", 4}      // JG 32 channel
};

volatile int mod_finetune[]=
{
    8363,   8413,   8463,   8529,   8581,   8651,   8723,   8757,
    7895,   7941,   7985,   8046,   8107,   8169,   8232,   8280
};

// -- Prototypes -------------------------------------------------------------
int detect_m31 (char *filename);
int detect_m15 (char *filename);
JGMOD *load_m (char *filename, int no_inst);
int get_mod_no_pat (int *table, int max_trk);
void lock_mod (JGMOD *j);
void *jgmod_calloc (int size);
int get_m_info(char *filename, int no_inst, JGMOD_INFO *ji);

//-- Codes -------------------------------------------------------------------


int get_m_info(char *filename, int no_inst, JGMOD_INFO *ji)
{
    JGMOD_FILE *f;


    if (no_inst == 15)
        {
        sprintf (ji->type_name, "MOD (15 Samples)");
        ji->type = MOD15_TYPE;
        }
    else if (no_inst == 31)
        {
        sprintf (ji->type_name, "MOD (31 Samples)");
        ji->type = MOD31_TYPE;
        }
    else
        {
        sprintf (jgmod_error, "MOD must have 15 or 31 samples");
        return -1;
        }


    f = jgmod_fopen (filename, "rb");
    if (f == null)
        {
        sprintf (jgmod_error, "Unable to open %s", filename);
        return -1;
        }

    jgmod_fread (ji->name, 20, f);
    jgmod_fclose(f);
    return 1;
}

//To detect protracker with 31 instruments
int detect_m31 (char *filename)
{
    JGMOD_FILE *f;
    char id[4];
    int index;
    
    f = jgmod_fopen (filename, "rb");
    if (f == null)
        return -1;

    jgmod_skip (f, 1080);
    jgmod_fread (id, 4, f);
    jgmod_fclose (f);

    for (index=0; memcmp("32FW", modtypes[index].id, 4); index++)
        if (memcmp (id, modtypes[index].id, 4) == 0)
            return 1;

    return -1;
}

// Load protracker 15 or 31 instruments. no_inst is used for
// determining no of instruments.
JGMOD *load_m (char *filename, int no_inst)
{
    JGMOD_FILE *f;
    JGMOD *j;
    PATTERN_INFO *pi;
    SAMPLE_INFO *si;
    NOTE_INFO *ni;
    SAMPLE *s;
    char *data;
    int index;
    int counter;
    int temp;
    char id[4];

    if (no_inst != 15 && no_inst != 31)
        {
        sprintf (jgmod_error, "MOD must be 15 or 31 instruments");
        return null;
        }

    j = jgmod_calloc (sizeof (JGMOD ));
    if (j == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for JGMOD structure");
        return null;
        }

    j->si = jgmod_calloc (sizeof (SAMPLE_INFO) * no_inst);    
    if (j->si == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for SAMPLE_INFO structure");
        destroy_mod (j);
        return null;
        }

    j->s = jgmod_calloc (sizeof (SAMPLE) * no_inst);
    if (j->s == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for SAMPLE structure");
        destroy_mod (j);
        return null;
        }

    j->no_sample = no_inst;
    j->global_volume = 64;
    j->tempo = 6;
    j->bpm = 125;
    for (index=0; index<MAX_ALLEG_VOICE; index++)            //set the panning position
        {
        if ( (index%4) == 0 || (index%4) == 3)
            *(j->panning + index) = 0;
        else
            *(j->panning + index) = 255;
        }


    f = jgmod_fopen (filename, "rb");
    if (f == null)
        {
        sprintf (jgmod_error, "Unable to open %s", filename);
        destroy_mod (j);
        return null;
        }

    jgmod_fread (j->name, 20, f);        //get the song name
    for (index=0; index<no_inst; index++)    //get the sample info
        {
        si = j->si + index;

        jgmod_skip (f, 22);
        si->lenght = jgmod_mgetw (f);
        si->c2spd = jgmod_getc(f);   //get finetune and change to c2spd
        si->volume = jgmod_getc(f);
        si->repoff = jgmod_mgetw (f) * 2;
        si->replen = jgmod_mgetw (f);
        si->transpose = 0;

        si->c2spd = mod_finetune[si->c2spd];

        if (si->lenght == 1)
            si->lenght = 0;
        else
            si->lenght *= 2;

        if (si->replen == 1)
            si->replen = 0;
        else
            si->replen *= 2;
        }

    j->no_trk = jgmod_getc(f);       // get no of track
    j->restart_pos = jgmod_getc(f);  // restart position

    for (index=0; index < 128; index++)
        *(j->pat_table + index) = jgmod_getc(f);
    
    j->no_pat = get_mod_no_pat (j->pat_table, 128);

    if (no_inst == 31)
        {
        jgmod_fread (id, 4, f);              // get the id
        for (index=0; memcmp("32FW", modtypes[index].id, 4); index++) // get no of channels
            {
            if (memcmp (id, modtypes[index].id, 4) == 0)
                break;
            }
        j->no_chn = modtypes[index].no_channel;
        }
    else
        j->no_chn = 4;

    j->pi = jgmod_calloc (j->no_pat * sizeof(PATTERN_INFO));
    if (j->pi == null)
        {
        sprintf (jgmod_error, "Unable to allocate enough memory for PATTERN_INFO");
        jgmod_fclose (f);
        destroy_mod(j);
        return null;
        }

    // allocate patterns;
    for (index=0; index<j->no_pat; index++)
        {
        pi = j->pi+index;
        pi->ni = jgmod_calloc (sizeof(NOTE_INFO) * 64 * j->no_chn);
        if (pi->ni == null)
            {
            sprintf (jgmod_error, "Unable to allocate enough memory for NOTE_INFO");
            jgmod_fclose (f);
            destroy_mod (j);
            return null;
            }
        }


    for (index=0; index<j->no_pat; index++)
        {
        pi = j->pi + index;
        pi->no_pos = 64;
        }

    // load notes
    for (counter=0; counter<j->no_pat; counter++)
        {
        pi = j->pi+counter;
        ni = pi->ni;
        
        for (index=0; index<(64 * j->no_chn); index++)
            {
            temp = jgmod_mgetl (f);
            ni->sample = ((temp >> 24) & 0xF0) + ((temp >> 12) & 0xF);
            ni->note = (temp >> 16) & 0xFFF;
            ni->command = (temp >> 8) & 0xF;
            ni->extcommand = temp & 0xFF;
            ni->volume = 0;

            if (ni->note)
                ni->note = NTSC / ni->note;   //change to hz

            ni++;
            }
        }

    // load the instrument 
    for (index=0; index<no_inst; index++)
        {
        s  = j->s + index;
        si = j->si +index;

        s->bits         = 8;

        #ifdef ALLEGRO_DATE
        s->stereo       = FALSE;
        #endif

        s->freq         = 1000;
        s->priority     = JGMOD_PRIORITY;
        s->len          = si->lenght;
        s->param        = -1;
        s->data         = jgmod_calloc (s->len);

        if (s->len)
            if (s->data == null)
                {
                sprintf (jgmod_error, "Unable to allocate enough memory for SAMPLE DATA");
                jgmod_fclose (f);
                destroy_mod (j);
                return null;
                }

        if (si->replen > 0)         //sample does loop
            {
            si->loop = LOOP_ON;
            s->loop_start   = si->repoff;
            s->loop_end     = si->repoff + si->replen;
            }
        else
            {
            si->loop = LOOP_OFF;
            s->loop_start   = 0;
            s->loop_end     = si->lenght;
            }

        jgmod_fread (s->data, s->len, f);
        for (temp=0; temp< (signed)(s->len); temp++)
            {
            data = (char *)s->data;
            data[temp] = data[temp] ^ 0x80;
            }
        }


    // process the restart position stuff
    if (j->restart_pos > j->no_trk)
        j->restart_pos = 0;

    jgmod_fclose (f);
    lock_mod (j);
    return j;
}

// to detect protracker with 15 instruments.
// not very reliable
int detect_m15 (char *filename)
{
    JGMOD_FILE *f;
    int index;
    int temp;

    f = jgmod_fopen (filename, "rb");
    if (f == null)
        return null;

    jgmod_skip (f, 20);  //skip the name of the music;

    for (index=0; index<15; index++)
        {
        jgmod_skip (f, 24);      //skip sample name and sample length
        temp = jgmod_getc (f);   //get sample finetune
        if (temp != 0)          //finetune should be 0
            {
            jgmod_fclose (f);
            return null;
            }

        temp = jgmod_getc(f);    //get sample volume
        if (temp > 64)          //should be <= 64
            {
            jgmod_fclose (f);
            return null;
            }

        jgmod_skip (f, 4);       //skip sample repeat offset and length
        }

    jgmod_fclose (f);
    return 1;
}



// to detect the no of patterns in protracker files.
int get_mod_no_pat (int *table, int max_trk)
{
    int index;
    int max=0;

    for (index=0; index<max_trk; index++)
        if (table[index] > max)
            max = table[index];

    max++;
    return max;
}

void *jgmod_calloc (int size)
{

#ifdef  __ALLEGRO_WINDOWS__
    if (size == 0)
        size = 1;
#endif

    return calloc (1, size);
}



--- NEW FILE: file_io.h ---
#ifndef FILE_IO_H
#define FILE_IO_H

#include "port.h"

// -- located in file_io.c ---------------------------------------------------
JGMOD_FILE *jgmod_fopen (char *filename, char *mode);
int jgmod_fclose (JGMOD_FILE *f);
void jgmod_fseek (JGMOD_FILE **f, char *filename, int offset);
void jgmod_skip (JGMOD_FILE *f, int skip);
int jgmod_fread (char *buf, int size, JGMOD_FILE *f);
int jgmod_getc (JGMOD_FILE *f);
int jgmod_mgetw (JGMOD_FILE *f);
long jgmod_mgetl (JGMOD_FILE *f);
int jgmod_igetw (JGMOD_FILE *f);
long jgmod_igetl (JGMOD_FILE *f);
int jgmod_putc (int c, JGMOD_FILE *f);
int jgmod_iputw (int w, JGMOD_FILE *f);
long jgmod_iputl (long w, JGMOD_FILE *f);
int jgmod_fwrite (void *buf, int size, JGMOD_FILE *f);

#endif

--- NEW FILE: unreal.txt ---
UNREAL
------
Unreal uses S3M and IT. JGMOD will only be able to load Unreal's S3M since
JGMOD supports S3M but not IT.

To search for Unreal music files, go to /music directory in Unreal cd-rom.
That directory is full of files with UMX extension. There should be 32 UMX
files. Below is a list of S3M files which JGMOD supports while the unlisted
UMX files are IT files.


Filename      Music name                       Channles used   Type
------------  ------------------------------   -------------   -----
CHIZRA1 .UMX  Chizra                            16              S3M
CRATER  .UMX  Hub 7                             16              S3M
DIGSH   .UMX  Shared Dig                        16              S3M
DUSK    .UMX  Dusk Horizon                      16              S3M
EVERSMOK.UMX  Bluff Eversmoking                 16              S3M
FIFTH   .UMX  Hub 5                             16              S3M
FOURTH  .UMX  hub 4                             16              S3M
GUARDIAN.UMX  Guardian                          10              S3M
ISOTOXIN.UMX  isotoxin - necros / fm            15              S3M
K_VISION.UMX  Nightvision - Sandman/KFM         16              S3M
NEWMCA13.UMX  Unreal #13 (By Michiel)           16              S3M
NEWMCA16.UMX  Unreal #16 (By Michiel)           16              S3M
NEWMCA7 .UMX  Unreal #7 (By Michiel)            16              S3M
NEWMCA9 .UMX  Unreal #9 (By Michiel)            16              S3M
SETI    .UMX  SETI                              15              S3M
SKYTWN  .UMX  All Hallows Sunset                16              S3M
SPIRE   .UMX  Hub 3                             16              S3M
SURFACE .UMX  Surfacing                         16              S3M
UNREAL4 .UMX  Erosion                           16              S3M
UTEMPLE .UMX  Unreal Crypt                      16              S3M
VORTEX  .UMX  Vortex Rikers                     16              S3M
WARGATE .UMX  Wargate                           16              S3M
WARLORD .UMX  Warlord Theme                     16              S3M



UNREAL TOURNAMENT
-----------------
Of all the 30 musics found in UT, only 2 are non-IT type and of course, the
rest are IT. How dissapointing. Only these 2 files are supported by JGMOD.

Filename      Music name                       Channles used   Type
------------  ------------------------------   -------------   -----
MECH8   .UMX  mechanism eight - necros/         16              S3M
FIREBR  .UMX                                    18              XM

--- NEW FILE: jgmod.txt ---
----------------------
U S I N G    J G M O D
----------------------

int fast_loading = FALSE;
    This variable affects only S3M loader. If FALSE, the S3M loader will use
    a method to detect the no of channels used by the music accurately but
    SLOW. If TRUE, the channels detection is less accurate but MUCH FASTER.
    Speed difference between these two settings depending on the speed of
    computer, cache memory and windows. Try these two settings and decide
    yourself which is better (default = FALSE). 


int enable_m15 = FALSE...
 
[truncated message content]

[Timewarp-commit] source/jgmod - New directory

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/jgmod
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29948/jgmod

Log Message:
Directory /cvsroot/timewarp/source/jgmod added to the repository

[Timewarp-commit] include/allegro font.h, NONE, 1.1 graphics.h, 1.2, 1.3 lzss.h, NONE, 1.1

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20939/include/allegro

Added Files:
	font.h graphics.h lzss.h 
Log Message:


--- NEW FILE: graphics.h ---
/*         ______   ___    ___
 *        /\  _  \ /\_ \  /\_ \
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Container for all graphics related routines.
 *
 *      By Shawn Hargreaves.
 *
 *      See readme.txt for copyright information.
 */


#ifndef ALLEGRO_GRAPHICS_H
#define ALLEGRO_GRAPHICS_H

#include "base.h"
#include "gfx.h"
#include "text.h"
#include "3d.h"
#include "draw.h"
#include "color.h"
#include "palette.h"
#include "rle.h"
#include "compiled.h"

#endif          /* ifndef ALLEGRO_GRAPHICS_H */


--- NEW FILE: lzss.h ---
/*         ______   ___    ___
 *        /\  _  \ /\_ \  /\_ \
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Compression routines.
 *
 *      By Shawn Hargreaves.
 *
 *      See readme.txt for copyright information.
 */


#ifndef ALLEGRO_LZSS_H
#define ALLEGRO_LZSS_H

#include "base.h"

#ifdef __cplusplus
   extern "C" {
#endif

typedef struct LZSS_PACK_DATA LZSS_PACK_DATA;
typedef struct LZSS_UNPACK_DATA LZSS_UNPACK_DATA;


AL_FUNC(LZSS_PACK_DATA *, create_lzss_pack_data, (void));
AL_FUNC(void, free_lzss_pack_data, (LZSS_PACK_DATA *dat));
AL_FUNC(int, lzss_write, (PACKFILE *file, LZSS_PACK_DATA *dat, int size, unsigned char *buf, int last));

AL_FUNC(LZSS_UNPACK_DATA *, create_lzss_unpack_data, (void));
AL_FUNC(void, free_lzss_unpack_data, (LZSS_UNPACK_DATA *dat));
AL_FUNC(int, lzss_read, (PACKFILE *file, LZSS_UNPACK_DATA *dat, int s, unsigned char *buf));


#ifdef __cplusplus
   }
#endif

#endif          /* ifndef ALLEGRO_LZSS_H */



--- NEW FILE: font.h ---
/*         ______   ___    ___
 *        /\  _  \ /\_ \  /\_ \
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Font loading routines.
 *
 *      By Evert Glebbeek.
 *
 *      See readme.txt for copyright information.
 */


#ifndef ALLEGRO_FONT_H
#define ALLEGRO_FONT_H

#include "base.h"

#ifdef __cplusplus
   extern "C" {
#endif

typedef struct FONT_GLYPH           /* a single monochrome font character */
{
   short w, h;
   ZERO_SIZE_ARRAY(unsigned char, dat);
} FONT_GLYPH;


struct FONT_VTABLE;

typedef struct FONT
{
   void *data;
   int height;
   struct FONT_VTABLE *vtable;
} FONT;

AL_FUNC(int, is_color_font, (FONT *f));
AL_FUNC(int, is_mono_font, (FONT *f));
AL_FUNC(int, is_compatible_font, (FONT *f1, FONT *f2));

AL_FUNC(void, register_font_file_type, (AL_CONST char *ext, FONT *(*load)(AL_CONST char *filename, RGB *pal, void *param)));
AL_FUNC(FONT *, load_font, (AL_CONST char *filename, RGB *pal, void *param));

AL_FUNC(FONT *, load_dat_font, (AL_CONST char *filename, RGB *pal, void *param));
AL_FUNC(FONT *, load_bios_font, (AL_CONST char *filename, RGB *pal, void *param));
AL_FUNC(FONT *, load_grx_font, (AL_CONST char *filename, RGB *pal, void *param));
AL_FUNC(FONT *, load_grx_or_bios_font, (AL_CONST char *filename, RGB *pal, void *param));
AL_FUNC(FONT *, load_bitmap_font, (AL_CONST char *fname, RGB *pal, void *param));
AL_FUNC(FONT *, load_txt_font, (AL_CONST char *fname, RGB *pal, void *param));

AL_FUNC(FONT *, grab_font_from_bitmap, (BITMAP *bmp));

AL_FUNC(int, get_font_ranges, (FONT *f));
AL_FUNC(int, get_font_range_begin, (FONT *f, int range));
AL_FUNC(int, get_font_range_end, (FONT *f, int range));
AL_FUNC(FONT *, extract_font_range, (FONT *f, int begin, int end));
AL_FUNC(FONT *, merge_fonts, (FONT *f1, FONT *f2));
AL_FUNC(int, transpose_font, (FONT *f, int drange));
#ifdef __cplusplus
   }
#endif

#endif          /* ifndef ALLEGRO_FONT_H */

[Timewarp-commit] include/allegro/platform aintosx.h, NONE, 1.1 alosx.h, NONE, 1.1 alosxcfg.h, NONE, 1.1 astdint.h, NONE, 1.1

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro/platform
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20939/include/allegro/platform

Added Files:
	aintosx.h alosx.h alosxcfg.h astdint.h 
Log Message:


--- NEW FILE: astdint.h ---
/*         ______   ___    ___ 
 *        /\  _  \ /\_ \  /\_ \ 
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      A header file to get definitions of uint*_t and int*_t.
 *
 *      By Peter Wang.
 * 
 *      See readme.txt for copyright information.
 */

#ifndef ASTDINT_H
#define ASTDINT_H

/* Please only include this file from include/allegro/internal/alconfig.h
 * and don't add more than inttypes.h/stdint.h emulation here.  Thanks.
 */



#if defined HAVE_INTTYPES_H
   #include <inttypes.h>
#elif defined HAVE_STDINT_H
   #include <stdint.h>
#elif defined ALLEGRO_I386 && defined ALLEGRO_LITTLE_ENDIAN
   #ifndef ALLEGRO_GUESS_INTTYPES_OK
      #warning Guessing the definitions of fixed-width integer types.
   #endif
   #define int8_t       signed char
   #define uint8_t      unsigned char
   #define int16_t      signed short
   #define uint16_t     unsigned short
   #define int32_t      signed int
   #define uint32_t     unsigned int
   #define intptr_t     int32_t
   #define uintptr_t    uint32_t
#else
   #error I dunno how to get the definitions of fixed-width integer types on your platform.  Please report this to your friendly Allegro developer.
#endif



#endif /* ifndef ASTDINT_H */

--- NEW FILE: aintosx.h ---
/*         ______   ___    ___
 *        /\  _  \ /\_ \  /\_ \
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Internal header file for the MacOS X Allegro library port.
 *
 *      By Angelo Mottola.
 *
 *      See readme.txt for copyright information.
 */


#ifndef AINTOSX_H
#define AINTOSX_H

#ifdef __OBJC__

#include "allegro/platform/aintunix.h"

#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
#include <pthread.h>


#ifndef NSAppKitVersionNumber10_1
#define NSAppKitVersionNumber10_1       620
#endif
#ifndef NSAppKitVersionNumber10_2
#define NSAppKitVersionNumber10_2       663
#endif


#define OSX_GFX_NONE                    0
#define OSX_GFX_WINDOW                  1
#define OSX_GFX_FULL                    2

#define BMP_EXTRA(bmp)                  ((BMP_EXTRA_INFO *)((bmp)->extra))

#define HID_MAX_DEVICES                 MAX_JOYSTICKS
#define HID_MOUSE                       0
#define HID_JOYSTICK                    1
#define HID_GAMEPAD                     2

#define HID_MAX_DEVICE_ELEMENTS         ((MAX_JOYSTICK_AXIS * MAX_JOYSTICK_STICKS) + MAX_JOYSTICK_BUTTONS)
#define HID_ELEMENT_BUTTON              0
#define HID_ELEMENT_AXIS                1
#define HID_ELEMENT_AXIS_PRIMARY_X      2
#define HID_ELEMENT_AXIS_PRIMARY_Y      3
#define HID_ELEMENT_STANDALONE_AXIS     4
#define HID_ELEMENT_HAT                 5



@interface AllegroAppDelegate : NSObject
- (BOOL)application: (NSApplication *)theApplication openFile: (NSString *)filename;
- (void)applicationDidFinishLaunching: (NSNotification *)aNotification;
- (void)applicationDidChangeScreenParameters: (NSNotification *)aNotification;
+ (void)app_main: (id)arg;
- (void)app_quit: (id)sender;
@end


@interface AllegroWindow : NSWindow
- (void)display;
- (void)miniaturize: (id)sender;
@end


@interface AllegroWindowDelegate : NSObject
- (BOOL)windowShouldClose: (id)sender;
- (void)windowDidDeminiaturize: (NSNotification *)aNotification;
@end


@interface AllegroView: NSQuickDrawView
- (void)resetCursorRects;
@end


typedef void RETSIGTYPE;


typedef struct BMP_EXTRA_INFO
{
   GrafPtr port;
} BMP_EXTRA_INFO;


typedef struct HID_ELEMENT
{
   int type;
   IOHIDElementCookie cookie;
   int max, min;
   int app;
   int col;
   int index;
   char *name;
} HID_ELEMENT;


typedef struct HID_DEVICE
{
   int type;
   char *manufacturer;
   char *product;
   int num_elements;
   int capacity;
   HID_ELEMENT *element;
   IOHIDDeviceInterface **interface;
   int cur_app;
} HID_DEVICE;

typedef struct 
{
   int count;
   int capacity;
   HID_DEVICE* devices;
} HID_DEVICE_COLLECTION;


void osx_event_handler(void);
int osx_bootstrap_ok(void);

void setup_direct_shifts(void);
void osx_init_fade_system(void);
void osx_fade_screen(int fade_in, double seconds);
void osx_qz_blit_to_self(BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
void osx_qz_created_sub_bitmap(BITMAP *bmp, BITMAP *parent);
BITMAP *osx_qz_create_video_bitmap(int width, int height);
BITMAP *osx_qz_create_system_bitmap(int width, int height);
void osx_qz_destroy_video_bitmap(BITMAP *bmp);
int osx_setup_colorconv_blitter(void);
void osx_update_dirty_lines(void);

uintptr_t osx_qz_write_line(BITMAP *bmp, int lyne);
void osx_qz_unwrite_line(BITMAP *bmp);
void osx_qz_acquire(BITMAP *bmp);
void osx_qz_release(BITMAP *bmp);

void osx_keyboard_handler(int pressed, NSEvent *event);
void osx_keyboard_modifiers(unsigned int new_mods);
void osx_keyboard_focused(int focused, int state);

void osx_mouse_handler(int x, int y, int dx, int dy, int dz, int buttons);
int osx_mouse_set_sprite(BITMAP *sprite, int x, int y);
int osx_mouse_show(BITMAP *bmp, int x, int y);
void osx_mouse_hide(void);
void osx_mouse_move(int x, int y);

HID_DEVICE_COLLECTION *osx_hid_scan(int type, HID_DEVICE_COLLECTION*);
void osx_hid_free(HID_DEVICE_COLLECTION *);


AL_VAR(NSBundle *, osx_bundle);
AL_VAR(void *, osx_event_mutex);
AL_VAR(void *, osx_window_mutex);
AL_VAR(int, osx_gfx_mode);
AL_VAR(int, osx_screen_used);
AL_VAR(NSCursor *, osx_blank_cursor);
AL_VAR(NSCursor *, osx_cursor);
AL_VAR(AllegroWindow *, osx_window);
AL_ARRAY(char, osx_window_title);
AL_VAR(int, osx_window_first_expose);
AL_VAR(CGDirectPaletteRef, osx_palette);
AL_VAR(int, osx_palette_dirty);
AL_VAR(int, osx_mouse_warped);
AL_VAR(int, osx_skip_mouse_move);
AL_VAR(int, osx_emulate_mouse_buttons);
AL_VAR(NSTrackingRectTag, osx_mouse_tracking_rect);
extern AL_METHOD(void, osx_window_close_hook, (void));


#endif

#endif

/* Local variables:       */
/* mode: objc             */
/* c-basic-offset: 3      */
/* indent-tabs-mode: nil  */
/* End:                   */

--- NEW FILE: alosx.h ---
/*         ______   ___    ___ 
 *        /\  _  \ /\_ \  /\_ \ 
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      MacOS X specific header defines.
 *
 *      By Angelo Mottola.
 *
 *      See readme.txt for copyright information.
 */


#ifndef ALOSX_H
#define ALOSX_H

#ifndef ALLEGRO_MACOSX
   #error bad include
#endif


#ifndef SCAN_DEPEND
   #include <stdio.h>
   #include <stdlib.h>
   #include <fcntl.h>
   #include <unistd.h>
   #include <signal.h>
   #include <pthread.h>
   #if defined __OBJC__ && defined ALLEGRO_SRC
      #undef TRUE
      #undef FALSE
      #import <mach/mach.h>
      #import <mach/mach_error.h>
      #import <AppKit/AppKit.h>
      #import <ApplicationServices/ApplicationServices.h>
      #import <Cocoa/Cocoa.h>
      #import <CoreAudio/CoreAudio.h>
      #import <AudioUnit/AudioUnit.h>
      #import <AudioToolbox/AudioToolbox.h>
      #import <QuickTime/QuickTime.h>
      #import <IOKit/IOKitLib.h>
      #import <IOKit/IOCFPlugIn.h>
      #import <IOKit/hid/IOHIDLib.h>
      #import <IOKit/hid/IOHIDKeys.h>
      #import <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
      #undef TRUE
      #undef FALSE
      #undef assert
      #define TRUE  -1
      #define FALSE 0
   #endif
#endif


/* The following code comes from alunix.h */
/* Magic to capture name of executable file */
extern int    __crt0_argc;
extern char **__crt0_argv;

#ifndef ALLEGRO_NO_MAGIC_MAIN
   #define ALLEGRO_MAGIC_MAIN
   #define main _mangled_main
   #undef END_OF_MAIN
   #define END_OF_MAIN() void *_mangled_main_address = (void*) _mangled_main;
#else
   #undef END_OF_MAIN
   #define END_OF_MAIN() void *_mangled_main_address;
#endif


/* System driver */
#define SYSTEM_MACOSX           AL_ID('O','S','X',' ')
AL_VAR(SYSTEM_DRIVER, system_macosx);

/* Timer driver */
#define TIMERDRV_UNIX_PTHREADS  AL_ID('P','T','H','R')
AL_VAR(TIMER_DRIVER, timerdrv_unix_pthreads);

/* Keyboard driver */
#define KEYBOARD_MACOSX         AL_ID('O','S','X','K')
AL_VAR(KEYBOARD_DRIVER, keyboard_macosx);

/* Mouse driver */
#define MOUSE_MACOSX            AL_ID('O','S','X','M')
AL_VAR(MOUSE_DRIVER, mouse_macosx);

/* Gfx drivers */
#define GFX_QUARTZ_WINDOW       AL_ID('Q','Z','W','N')
#define GFX_QUARTZ_FULLSCREEN   AL_ID('Q','Z','F','L')
AL_VAR(GFX_DRIVER, gfx_quartz_window);
AL_VAR(GFX_DRIVER, gfx_quartz_full);

/* Digital sound drivers */
#define DIGI_CORE_AUDIO         AL_ID('D','C','A',' ')
#define DIGI_SOUND_MANAGER      AL_ID('S','N','D','M')
AL_VAR(DIGI_DRIVER, digi_core_audio);
AL_VAR(DIGI_DRIVER, digi_sound_manager);

/* MIDI music drivers */
#define MIDI_CORE_AUDIO         AL_ID('M','C','A',' ')
#define MIDI_QUICKTIME          AL_ID('Q','T','M',' ')
AL_VAR(MIDI_DRIVER, midi_core_audio);
AL_VAR(MIDI_DRIVER, midi_quicktime);

/* Joystick drivers */
#define JOYSTICK_HID            AL_ID('H','I','D','J')
AL_VAR(JOYSTICK_DRIVER, joystick_hid);


#endif

--- NEW FILE: alosxcfg.h ---
/*         ______   ___    ___ 
 *        /\  _  \ /\_ \  /\_ \ 
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Configuration defines for use with MacOS X.
 *
 *      By Angelo Mottola.
 *
 *      See readme.txt for copyright information.
 */


#ifndef ALOSXCFG_H
#define ALOSXCFG_H

/* Provide implementations of missing functions */
#define ALLEGRO_NO_STRICMP
#define ALLEGRO_NO_STRLWR
#define ALLEGRO_NO_STRUPR

/* Provide implementations of missing definitions */
#define O_BINARY     0

/* Override default definitions for this platform */
#define AL_RAND()    ((rand() >> 16) & 0x7fff)

/* A static auto config */
#define HAVE_LIBPTHREAD
#define HAVE_DIRENT_H
#define HAVE_INTTYPES_H
#define HAVE_STDINT_H
#define HAVE_SYS_DIR_H
#define HAVE_SYS_TIME_H
#define TIME_WITH_SYS_TIME

/* Describe this platform */
#define ALLEGRO_PLATFORM_STR  "MacOS X"
#define ALLEGRO_BIG_ENDIAN
#define ALLEGRO_CONSOLE_OK
#define ALLEGRO_USE_CONSTRUCTOR
#define ALLEGRO_MULTITHREADED

/* Arrange for other headers to be included later on */
#define ALLEGRO_EXTRA_HEADER     "allegro/platform/alosx.h"


#endif

[Timewarp-commit] include/allegro/platform aintbeos.h, 1.4, 1.5 aintdos.h, 1.3, 1.4 aintlnx.h, 1.3, 1.4 aintmac.h, 1.3, 1.4 aintqnx.h, 1.3, 1.4 aintunix.h, 1.4, 1.5 aintwin.h, 1.4, 1.5 al386gcc.h, 1.4, 1.5 al386vc.h, 1.3, 1.4 al386wat.h, 1.3, 1.4 albcc32.h, 1.3, 1.4 albecfg.h, 1.4, 1.5 albeos.h, 1.3, 1.4 aldjgpp.h, 1.4, 1.5 aldos.h, 1.3, 1.4 almac.h, 1.3, 1.4 almaccfg.h, 1.4, 1.5 almngw32.h, 1.4, 1.5 almsvc.h, 1.4, 1.5 alqnx.h, 1.4, 1.5 alqnxcfg.h, 1.4, 1.5 alucfg.h, 1.3, 1.4 alunix.h, 1.4, 1.5 alunixac.hin, 1.4, 1.5 alwatcom.h, 1.4, 1.5 alwin.h, 1.4, 1.5

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro/platform
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20384/include/allegro/platform

Modified Files:
	aintbeos.h aintdos.h aintlnx.h aintmac.h aintqnx.h aintunix.h 
	aintwin.h al386gcc.h al386vc.h al386wat.h albcc32.h albecfg.h 
	albeos.h aldjgpp.h aldos.h almac.h almaccfg.h almngw32.h 
	almsvc.h alqnx.h alqnxcfg.h alucfg.h alunix.h alunixac.hin 
	alwatcom.h alwin.h 
Log Message:


Index: alwatcom.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alwatcom.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alwatcom.h	15 Nov 2003 01:37:38 -0000	1.4
--- alwatcom.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 37,40 ****
--- 37,49 ----
  
  
+ /* these are available in OpenWatcom 1.3 (12.3) */
+ #if __WATCOMC__ >= 1230
+    #define HAVE_INTTYPES_H
+    #define HAVE_STDINT_H
+ #else
+    #define ALLEGRO_GUESS_INTTYPES_OK
+ #endif
+ 
+ 
  /* describe this platform */
  #define ALLEGRO_PLATFORM_STR  "Watcom"
***************
*** 47,50 ****
--- 56,61 ----
  #define ALLEGRO_LFN  0
  
+ #define LONG_LONG    long long
+ 
  #if __WATCOMC__ >= 1100
     #define ALLEGRO_MMX
***************
*** 90,93 ****
--- 101,108 ----
  
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  typedef union __dpmi_regs
  {
***************
*** 158,161 ****
--- 173,181 ----
  void _unlock_dpmi_data(void *addr, int size);
  
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+ 
  #define END_OF_FUNCTION(x)          void x##_end(void) { }
  #define END_OF_STATIC_FUNCTION(x)   static void x##_end(void) { }
***************
*** 170,172 ****
  #define ALLEGRO_EXTRA_HEADER     "allegro/platform/aldos.h"
  #define ALLEGRO_INTERNAL_HEADER  "allegro/platform/aintdos.h"
- 
--- 190,191 ----

Index: aintmac.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintmac.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintmac.h	8 Jun 2003 19:24:57 -0000	1.3
--- aintmac.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 43,50 ****
  extern void _mac_sys_blit8(BITMAP *src, BITMAP *dst, int src_x, int src_y, int dst_x, int dst_y, int w, int h);
  extern void _mac_sys_selfblit8(BITMAP *src, BITMAP *dst, int src_x, int src_y, int dst_x, int dst_y, int w, int h);
! extern int _mac_sys_triangle(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int x3, int y3, int color);
! extern void _mac_sys_rectfill8(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int color);
  extern void _mac_sys_hline8(struct BITMAP *bmp, int x1, int y, int x2, int color);
! extern void _mac_sys_vline8(struct BITMAP *bmp, int x, int y1, int y2, int color);
  extern BITMAP *_CGrafPtr_to_system_bitmap(CGrafPtr cg);
  
--- 43,50 ----
  extern void _mac_sys_blit8(BITMAP *src, BITMAP *dst, int src_x, int src_y, int dst_x, int dst_y, int w, int h);
  extern void _mac_sys_selfblit8(BITMAP *src, BITMAP *dst, int src_x, int src_y, int dst_x, int dst_y, int w, int h);
! extern int _mac_sys_triangle(struct BITMAP *bmp, int x1, int y_1, int x2, int y2, int x3, int y3, int color);
! extern void _mac_sys_rectfill8(struct BITMAP *bmp, int x1, int y_1, int x2, int y2, int color);
  extern void _mac_sys_hline8(struct BITMAP *bmp, int x1, int y, int x2, int color);
! extern void _mac_sys_vline8(struct BITMAP *bmp, int x, int y_1, int y2, int color);
  extern BITMAP *_CGrafPtr_to_system_bitmap(CGrafPtr cg);
  

Index: al386vc.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/al386vc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** al386vc.h	8 Jun 2003 19:24:57 -0000	1.3
--- al386vc.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 45,54 ****
   *  Bank switch function.
   */
! INLINE _AL_DLL unsigned long bmp_write_line(BITMAP *bmp, int line)
  { 
     _asm { 
        mov edx, bmp
        mov ecx, [edx]BITMAP.write_bank
!       mov eax, line
        call ecx
     }
--- 45,54 ----
   *  Bank switch function.
   */
! INLINE _AL_DLL uintptr_t bmp_write_line(BITMAP *bmp, int lyne)
  { 
     _asm { 
        mov edx, bmp
        mov ecx, [edx]BITMAP.write_bank
!       mov eax, lyne
        call ecx
     }
***************
*** 62,71 ****
   *  Bank switch function.
   */
! INLINE _AL_DLL unsigned long bmp_read_line(BITMAP *bmp, int line)
  {
     _asm {
        mov edx, bmp
        mov ecx, [edx]BITMAP.read_bank
!       mov eax, line
        call ecx
     }
--- 62,71 ----
   *  Bank switch function.
   */
! INLINE _AL_DLL uintptr_t bmp_read_line(BITMAP *bmp, int lyne)
  {
     _asm {
        mov edx, bmp
        mov ecx, [edx]BITMAP.read_bank
!       mov eax, lyne
        call ecx
     }

Index: almngw32.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/almngw32.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** almngw32.h	15 Nov 2003 01:37:38 -0000	1.4
--- almngw32.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 27,30 ****
--- 27,36 ----
  
  
+ /* a static auto config */
+ /* older mingw's don't seem to have inttypes.h */
+ /* #define HAVE_INTTYPES_H */
+ #define HAVE_STDINT_H
+ 
+ 
  /* describe this platform */
  #ifdef ALLEGRO_STATICLINK
***************
*** 38,43 ****
  #define ALLEGRO_LITTLE_ENDIAN
  #define ALLEGRO_USE_CONSTRUCTOR
  
! #ifdef USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN
--- 44,50 ----
  #define ALLEGRO_LITTLE_ENDIAN
  #define ALLEGRO_USE_CONSTRUCTOR
+ #define ALLEGRO_MULTITHREADED
  
! #ifdef ALLEGRO_USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN

Index: al386wat.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/al386wat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** al386wat.h	8 Jun 2003 19:24:57 -0000	1.3
--- al386wat.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 53,57 ****
   *  Bank switch functions.
   */
! unsigned long _bmp_bank_switcher(BITMAP *bmp, int line, void *bank_switch);
  
  #pragma aux _bmp_bank_switcher =    \
--- 53,57 ----
   *  Bank switch functions.
   */
! uintptr_t _bmp_bank_switcher(BITMAP *bmp, int lyne, void *bank_switch);
  
  #pragma aux _bmp_bank_switcher =    \
***************
*** 61,66 ****
     value [eax];
  
! #define bmp_write_line(bmp, line)   _bmp_bank_switcher(bmp, line, (void *)bmp->write_bank)
! #define bmp_read_line(bmp, line)    _bmp_bank_switcher(bmp, line, (void *)bmp->read_bank)
  
  
--- 61,66 ----
     value [eax];
  
! #define bmp_write_line(bmp, lyne)   _bmp_bank_switcher(bmp, lyne, (void *)bmp->write_bank)
! #define bmp_read_line(bmp, lyne)    _bmp_bank_switcher(bmp, lyne, (void *)bmp->read_bank)
  
  

Index: albcc32.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/albcc32.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** albcc32.h	8 Jun 2003 19:24:57 -0000	1.3
--- albcc32.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 31,35 ****
  #pragma warn -8004  /* unused assigned value         */
  #pragma warn -8008  /* condition always met          */
- #pragma warn -8027  /* inline functions not expanded */
  #pragma warn -8057  /* unused parameter              */
  #pragma warn -8066  /* unreachable code              */
--- 31,34 ----
***************
*** 41,46 ****
  #define ALLEGRO_I386
  #define ALLEGRO_LITTLE_ENDIAN
  
! #ifdef USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN
--- 40,48 ----
  #define ALLEGRO_I386
  #define ALLEGRO_LITTLE_ENDIAN
+ #define ALLEGRO_GUESS_INTTYPES_OK
+    /* TODO: check if BCC has inttypes.h and/or stdint.h */
+ #define ALLEGRO_MULTITHREADED
  
! #ifdef ALLEGRO_USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN

Index: aintdos.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintdos.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintdos.h	8 Jun 2003 19:24:57 -0000	1.3
--- aintdos.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 174,181 ****
  
  
- /* VGA register access helpers */
- #include "allegro/internal/aintvga.h"
- 
- 
  
  #ifdef __cplusplus
--- 174,177 ----
***************
*** 183,185 ****
--- 179,184 ----
  #endif
  
+ /* VGA register access helpers */
+ #include "allegro/internal/aintvga.h"
+ 
  #endif          /* ifndef AINTDOS_H */

Index: albecfg.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/albecfg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** albecfg.h	15 Nov 2003 01:37:38 -0000	1.4
--- albecfg.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 27,30 ****
--- 27,32 ----
  /* a static auto config */
  #define HAVE_DIRENT_H
+ #define HAVE_INTTYPES_H		/* TODO: check this */
+ #define HAVE_STDINT_H		/* TODO: check this */
  #define HAVE_SYS_DIR_H
  #define HAVE_SYS_TIME_H
***************
*** 36,39 ****
--- 38,42 ----
  #define ALLEGRO_CONSOLE_OK
  #define ALLEGRO_USE_CONSTRUCTOR
+ #define ALLEGRO_MULTITHREADED
  
  /* arrange for other headers to be included later on */

Index: aldos.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aldos.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aldos.h	8 Jun 2003 19:24:57 -0000	1.3
--- aldos.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 72,75 ****
--- 72,76 ----
  #define JOY_TYPE_SIDEWINDER      AL_ID('S','W',' ',' ')
  #define JOY_TYPE_SIDEWINDER_AG   AL_ID('S','W','A','G')
+ #define JOY_TYPE_SIDEWINDER_PP   AL_ID('S','W','P','P')
  #define JOY_TYPE_GAMEPAD_PRO     AL_ID('G','P','R','O')
  #define JOY_TYPE_GRIP            AL_ID('G','R','I','P')
***************
*** 105,108 ****
--- 106,110 ----
  AL_VAR(JOYSTICK_DRIVER, joystick_sw);
  AL_VAR(JOYSTICK_DRIVER, joystick_sw_ag);
+ AL_VAR(JOYSTICK_DRIVER, joystick_sw_pp);
  AL_VAR(JOYSTICK_DRIVER, joystick_gpro);
  AL_VAR(JOYSTICK_DRIVER, joystick_grip);
***************
*** 140,144 ****
  #define JOYSTICK_DRIVER_SIDEWINDER                                \
        { JOY_TYPE_SIDEWINDER,     &joystick_sw,        TRUE  },    \
!       { JOY_TYPE_SIDEWINDER_AG,  &joystick_sw_ag,     TRUE  },
  
  #define JOYSTICK_DRIVER_GAMEPAD_PRO                               \
--- 142,147 ----
  #define JOYSTICK_DRIVER_SIDEWINDER                                \
        { JOY_TYPE_SIDEWINDER,     &joystick_sw,        TRUE  },    \
!       { JOY_TYPE_SIDEWINDER_AG,  &joystick_sw_ag,     TRUE  },    \
!       { JOY_TYPE_SIDEWINDER_PP,  &joystick_sw_pp,     TRUE  },
  
  #define JOYSTICK_DRIVER_GAMEPAD_PRO                               \
***************
*** 210,213 ****
--- 213,219 ----
  /*******************************************/
  
+ #define GFX_HAS_VGA
+ #define GFX_HAS_VBEAF
+ 
  #define GFX_VGA                  AL_ID('V','G','A',' ')
  #define GFX_MODEX                AL_ID('M','O','D','X')
***************
*** 219,228 ****
  #define GFX_XTENDED              AL_ID('X','T','N','D')
  
- #define GFX_SAFE_ID              GFX_VGA
- #define GFX_SAFE_DEPTH           8
- #define GFX_SAFE_W               320
- #define GFX_SAFE_H               200
- 
- 
  AL_VAR(GFX_DRIVER, gfx_vga);
  AL_VAR(GFX_DRIVER, gfx_modex);
--- 225,228 ----
***************
*** 260,267 ****
  
  
! AL_VAR(GFX_VTABLE, __modex_vtable);
! 
! 
! AL_FUNC(void, split_modex_screen, (int line));
  
  
--- 260,264 ----
  
  
! AL_FUNC_DEPRECATED(void, split_modex_screen, (int lyne));
  
  
***************
*** 347,350 ****
--- 344,354 ----
  
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  AL_FUNC(int, load_ibk, (AL_CONST char *filename, int drums));
  
+ #ifdef __cplusplus
+ }
+ #endif

Index: aintlnx.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintlnx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintlnx.h	8 Jun 2003 19:24:57 -0000	1.3
--- aintlnx.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 60,67 ****
  /******************************************/
  
! #define PRIVATE_SIZE   1
  
  typedef struct STD_DRIVER {
!    unsigned    type; /* One of the above STD_ constants */
  
     int (*update) (void);
--- 60,72 ----
  /******************************************/
  
! /* This "standard drivers" business is mostly a historical artifact.
!  * It was highly over-engineered, now simplified.  It has been mostly
!  * superseded by the newer, shinier, better bg_man.  But hey, at least
!  * it didn't suffer the fate of its cousin lasyncio.c, now dead,
!  * buried, and without a tombstone to show for it. --pw
!  */
  
  typedef struct STD_DRIVER {
!    unsigned    type; /* One of the below STD_ constants */
  
     int (*update) (void);
***************
*** 70,108 ****
  
     int         fd;   /* Descriptor of the opened device */
- 
- #ifndef __cplusplus
-    unsigned    private[PRIVATE_SIZE];
- #else
-    unsigned    priv[PRIVATE_SIZE];
- #endif
  } STD_DRIVER;
  
! #define STD_RTC              0
! #define STD_MOUSE            1
! #define STD_KBD              2
  
! #define N_STD_DRIVERS        3
  
  /* List of standard drivers */
  extern STD_DRIVER *__al_linux_std_drivers[];
  
- /* Indices of the fields in the STD_DRIVER.private array */
- #define PRIV_ENABLED       0
- 
  /* Exported functions */
  int  __al_linux_add_standard_driver (STD_DRIVER *spec);
  int  __al_linux_remove_standard_driver (STD_DRIVER *spec);
! int  __al_linux_update_standard_driver (int type);
! void __al_linux_update_standard_drivers (void);
! void __al_linux_async_set_drivers (int which, int on_off);
! void __al_linux_disable_standard_driver (int type);
! void __al_linux_enable_standard_driver (int type);
! 
! 
! /******************************************/
! /************ Asynchronous I/O ************/ /* (src/linux/lasyncio.c) */
! /******************************************/
! 
! extern unsigned __al_linux_async_io_mode;
  
  
--- 75,94 ----
  
     int         fd;   /* Descriptor of the opened device */
  } STD_DRIVER;
  
! #define STD_MOUSE            0
! #define STD_KBD              1
  
! #define N_STD_DRIVERS        2
  
  /* List of standard drivers */
  extern STD_DRIVER *__al_linux_std_drivers[];
  
  /* Exported functions */
  int  __al_linux_add_standard_driver (STD_DRIVER *spec);
  int  __al_linux_remove_standard_driver (STD_DRIVER *spec);
! void __al_linux_update_standard_drivers (int threaded);
! void __al_linux_suspend_standard_drivers (void);
! void __al_linux_resume_standard_drivers (void);
  
  
***************
*** 210,216 ****
  
  int __al_linux_set_display_switch_mode (int mode);
- int __al_linux_set_display_switch_callback (int dir, void (*cb) (void));
- void __al_linux_remove_display_switch_callback (void (*cb) (void));
- 
  void __al_linux_display_switch_lock (int lock, int foreground);
  
--- 196,199 ----
***************
*** 240,251 ****
  /*******************************/
  
- struct mouse_info {
-    int x, y, z, l, r, m;
-    int updated;
- };
- 
  typedef struct INTERNAL_MOUSE_DRIVER {
     int device;
!    int (*process) (unsigned char *buf, int buf_size, struct mouse_info *info);
     int num_buttons;
  } INTERNAL_MOUSE_DRIVER;
--- 223,229 ----
  /*******************************/
  
  typedef struct INTERNAL_MOUSE_DRIVER {
     int device;
!    int (*process) (unsigned char *buf, int buf_size);
     int num_buttons;
  } INTERNAL_MOUSE_DRIVER;
***************
*** 254,266 ****
  void __al_linux_mouse_exit (void);
  void __al_linux_mouse_position (int x, int y);
! void __al_linux_mouse_set_range (int x1, int y1, int x2, int y2);
  void __al_linux_mouse_set_speed (int xspeed, int yspeed);
  void __al_linux_mouse_get_mickeys (int *mickeyx, int *mickeyy);
! 
! 
! /* VGA register access helpers */
! #include "allegro/internal/aintern.h"
! #include "allegro/internal/aintvga.h"
! 
  
  
--- 232,239 ----
  void __al_linux_mouse_exit (void);
  void __al_linux_mouse_position (int x, int y);
! void __al_linux_mouse_set_range (int x1, int y_1, int x2, int y2);
  void __al_linux_mouse_set_speed (int xspeed, int yspeed);
  void __al_linux_mouse_get_mickeys (int *mickeyx, int *mickeyy);
! void __al_linux_mouse_handler (int x, int y, int z, int b);
  
  
***************
*** 269,272 ****
--- 242,252 ----
  #endif
  
+ /* VGA register access helpers */
+ /* This is conditional because configure may have disabled VGA support */
+ #ifdef ALLEGRO_LINUX_VGA
+    #include "allegro/internal/aintern.h"
+    #include "allegro/internal/aintvga.h"
+ #endif
+ 
  #endif /* ifndef AINTLNX_H */
  

Index: almsvc.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/almsvc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** almsvc.h	15 Nov 2003 01:37:38 -0000	1.4
--- almsvc.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 38,43 ****
  #define ALLEGRO_I386
  #define ALLEGRO_LITTLE_ENDIAN
  
! #ifdef USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN
--- 38,45 ----
  #define ALLEGRO_I386
  #define ALLEGRO_LITTLE_ENDIAN
+ #define ALLEGRO_GUESS_INTTYPES_OK
+ #define ALLEGRO_MULTITHREADED
  
! #ifdef ALLEGRO_USE_CONSOLE
     #define ALLEGRO_CONSOLE_OK
     #define ALLEGRO_NO_MAGIC_MAIN

Index: alunixac.hin
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alunixac.hin,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alunixac.hin	15 Nov 2003 01:37:38 -0000	1.4
--- alunixac.hin	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 1,204 ****
! /* include/allegro/platform/alunixac.hin.  Generated automatically from configure.in by autoheader.  */
! /* Define if you want support for 8 bpp modes.  */
! #undef ALLEGRO_COLOR8
  
! /* Define if you want support for 16 bpp modes.  */
  #undef ALLEGRO_COLOR16
  
! /* Define if you want support for 24 bpp modes.  */
  #undef ALLEGRO_COLOR24
  
! /* Define if you want support for 32 bpp modes.  */
  #undef ALLEGRO_COLOR32
  
! /* Define if compiler prepends underscore to symbols.  */
! #undef ALLEGRO_ASM_PREFIX
  
! /* Define if assembler supports MMX.  */
! #undef ALLEGRO_MMX
  
! /* Define if assembler supports SSE.  */
! #undef ALLEGRO_SSE
  
! /* Define for Unix platforms, to use C convention for bank switching.  */
! #undef ALLEGRO_NO_ASM
  
! /* Define if target platform is linux.  */
! #undef ALLEGRO_LINUX
  
! /* Define to enable Linux console VGA driver */
! #undef ALLEGRO_LINUX_VGA
  
! /* Define to enable Linux console fbcon driver */
  #undef ALLEGRO_LINUX_FBCON
  
! /* Define to enable Linux console VBE/AF driver */
! #undef ALLEGRO_LINUX_VBEAF
! 
! /* Define to enable Linux console SVGAlib driver */
  #undef ALLEGRO_LINUX_SVGALIB
  
! /* Define if SVGAlib driver can check vga_version */
  #undef ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
  
! /* Define if target machine is little endian.  */
! #undef ALLEGRO_LITTLE_ENDIAN
! 
! /* Define if target machine is big endian.  */
! #undef ALLEGRO_BIG_ENDIAN
  
! /* Define if dynamically loaded modules are supported.  */
! #undef ALLEGRO_WITH_MODULES
  
! /* Define if you need support for X-Windows.  */
! #undef ALLEGRO_WITH_XWINDOWS
  
! /* Define if MIT-SHM extension is supported.  */
! #undef ALLEGRO_XWINDOWS_WITH_SHM
  
! /* Define if XF86VidMode extension is supported.  */
! #undef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
  
! /* Define if XF86DGA extension is supported.  */
! #undef ALLEGRO_XWINDOWS_WITH_XF86DGA
  
! /* Define if DGA version 2.0 or newer is supported */
! #undef ALLEGRO_XWINDOWS_WITH_XF86DGA2
  
! /* Define if OSS DIGI driver is supported.  */
! #undef ALLEGRO_WITH_OSSDIGI
  
! /* Define if OSS MIDI driver is supported.  */
! #undef ALLEGRO_WITH_OSSMIDI
  
! /* Define if ALSA DIGI driver is supported.  */
  #undef ALLEGRO_WITH_ALSADIGI
  
! /* Define if ALSA MIDI driver is supported.  */
  #undef ALLEGRO_WITH_ALSAMIDI
  
! /* Define if ESD DIGI driver is supported.  */
  #undef ALLEGRO_WITH_ESDDIGI
  
! /* Define if aRts DIGI driver is supported.  */
! #undef ALLEGRO_WITH_ARTSDIGI
  
! /* Define to (void *)-1, if MAP_FAILED is not defined.  */
! #undef MAP_FAILED
  
! /* Define if constructor attribute is supported. */
! #undef ALLEGRO_USE_CONSTRUCTOR
  
! /* Define if sched_yield is provided by some library.  */
! #undef ALLEGRO_USE_SCHED_YIELD
  
  
! /* Define if you have the <dirent.h> header file, and it defines `DIR'. */
  #undef HAVE_DIRENT_H
  
! /* Define if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H
  
! /* Define if you don't have `vprintf' but do have `_doprnt.' */
! #undef HAVE_DOPRNT
! 
! /* Define if you have the <fcntl.h> header file. */
  #undef HAVE_FCNTL_H
  
! /* Define if you have the `getpagesize' function. */
! #undef HAVE_GETPAGESIZE
! 
! /* Define if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
! /* Define if you have the `pthread' library (-lpthread). */
  #undef HAVE_LIBPTHREAD
  
! /* Define if you have the <limits.h> header file. */
  #undef HAVE_LIMITS_H
  
! /* Define if you have the <linux/joystick.h> header file. */
  #undef HAVE_LINUX_JOYSTICK_H
  
! /* Define if you have the <linux/soundcard.h> header file. */
  #undef HAVE_LINUX_SOUNDCARD_H
  
! /* Define if you have the <machine/soundcard.h> header file. */
  #undef HAVE_MACHINE_SOUNDCARD_H
  
! /* Define if you have the `memcmp' function. */
  #undef HAVE_MEMCMP
  
! /* Define if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H
  
! /* Define if you have the `mkstemp' function. */
  #undef HAVE_MKSTEMP
  
! /* Define if you have a working `mmap' system call. */
  #undef HAVE_MMAP
  
! /* Define if you have the <ndir.h> header file, and it defines `DIR'. */
  #undef HAVE_NDIR_H
  
! /* Define if you have the <soundcard.h> header file. */
  #undef HAVE_SOUNDCARD_H
  
! /* Define if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H
  
! /* Define if you have the `stricmp' function. */
  #undef HAVE_STRICMP
  
! /* Define if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
! /* Define if you have the <string.h> header file. */
  #undef HAVE_STRING_H
  
! /* Define if you have the `strlwr' function. */
  #undef HAVE_STRLWR
  
! /* Define if you have the `strupr' function. */
  #undef HAVE_STRUPR
  
! /* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
  #undef HAVE_SYS_DIR_H
  
! /* Define if you have the <sys/io.h> header file. */
  #undef HAVE_SYS_IO_H
  
! /* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
  #undef HAVE_SYS_NDIR_H
  
! /* Define if you have the <sys/soundcard.h> header file. */
  #undef HAVE_SYS_SOUNDCARD_H
  
! /* Define if you have the <sys/time.h> header file. */
  #undef HAVE_SYS_TIME_H
  
! /* Define if you have the <sys/utsname.h> header file. */
  #undef HAVE_SYS_UTSNAME_H
  
! /* Define if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
! /* Define if you have the `vprintf' function. */
  #undef HAVE_VPRINTF
  
  /* Define as the return type of signal handlers (`int' or `void'). */
  #undef RETSIGTYPE
  
! /* Define if you have the ANSI C header files. */
  #undef STDC_HEADERS
  
! /* Define if you can safely include both <sys/time.h> and <time.h>. */
  #undef TIME_WITH_SYS_TIME
  
! /* Define if your <sys/time.h> declares `struct tm'. */
  #undef TM_IN_SYS_TIME
  
! /* Define if your processor stores words with the most significant byte first
!    (like Motorola and SPARC, unlike Intel and VAX). */
  #undef WORDS_BIGENDIAN
  
--- 1,264 ----
! /* include/allegro/platform/alunixac.hin.  Generated from configure.in by autoheader.  */
  
! /* Define to the installed ALSA version. */
! #undef ALLEGRO_ALSA_VERSION
! 
! /* Define if compiler prepends underscore to symbols. */
! #undef ALLEGRO_ASM_PREFIX
! 
! /* Define if target machine is big endian. */
! #undef ALLEGRO_BIG_ENDIAN
! 
! /* Define if you want support for 16 bpp modes. */
  #undef ALLEGRO_COLOR16
  
! /* Define if you want support for 24 bpp modes. */
  #undef ALLEGRO_COLOR24
  
! /* Define if you want support for 32 bpp modes. */
  #undef ALLEGRO_COLOR32
  
! /* Define if you want support for 8 bpp modes. */
! #undef ALLEGRO_COLOR8
  
! /* Define if target platform is Darwin. */
! #undef ALLEGRO_DARWIN
  
! /* Define to 1 if you have getexecname */
! #undef ALLEGRO_HAVE_GETEXECNAME
  
! /* Define to 1 if procfs reveals argc and argv */
! #undef ALLEGRO_HAVE_PROCFS_ARGCV
  
! /* Define to 1 if you have a System V sys/procfs.h */
! #undef ALLEGRO_HAVE_SV_PROCFS
  
! /* Define if target platform is linux. */
! #undef ALLEGRO_LINUX
  
! /* Define to enable Linux console fbcon driver. */
  #undef ALLEGRO_LINUX_FBCON
  
! /* Define to enable Linux console SVGAlib driver. */
  #undef ALLEGRO_LINUX_SVGALIB
  
! /* Define if SVGAlib driver can check vga_version. */
  #undef ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
  
! /* Define to enable Linux console VBE/AF driver. */
! #undef ALLEGRO_LINUX_VBEAF
  
! /* Define to enable Linux console VGA driver. */
! #undef ALLEGRO_LINUX_VGA
  
! /* Define if target machine is little endian. */
! #undef ALLEGRO_LITTLE_ENDIAN
  
! /* Define if assembler supports MMX. */
! #undef ALLEGRO_MMX
  
! /* Define for Unix platforms, to use C convention for bank switching. */
! #undef ALLEGRO_NO_ASM
  
! /* Define if assembler supports SSE. */
! #undef ALLEGRO_SSE
  
! /* Define if constructor attribute is supported. */
! #undef ALLEGRO_USE_CONSTRUCTOR
  
! /* Define if sched_yield is provided by some library. */
! #undef ALLEGRO_USE_SCHED_YIELD
  
! /* Define if XIM extension is supported. */
! #undef ALLEGRO_USE_XIM
  
! /* Define if ALSA DIGI driver is supported. */
  #undef ALLEGRO_WITH_ALSADIGI
  
! /* Define if ALSA MIDI driver is supported. */
  #undef ALLEGRO_WITH_ALSAMIDI
  
! /* Define if aRts DIGI driver is supported. */
! #undef ALLEGRO_WITH_ARTSDIGI
! 
! /* Define if ESD DIGI driver is supported. */
  #undef ALLEGRO_WITH_ESDDIGI
  
! /* Define if JACK DIGI driver is supported. */
! #undef ALLEGRO_WITH_JACKDIGI
  
! /* Define if you need to use a magic main. */
! #undef ALLEGRO_WITH_MAGIC_MAIN
  
! /* Define if dynamically loaded modules are supported. */
! #undef ALLEGRO_WITH_MODULES
  
! /* Define if OSS DIGI driver is supported. */
! #undef ALLEGRO_WITH_OSSDIGI
  
+ /* Define if OSS MIDI driver is supported. */
+ #undef ALLEGRO_WITH_OSSMIDI
  
! /* Define if SGI AL DIGI driver is supported. */
! #undef ALLEGRO_WITH_SGIALDIGI
! 
! /* Define if you need support for X-Windows. */
! #undef ALLEGRO_WITH_XWINDOWS
! 
! /* Define if MIT-SHM extension is supported. */
! #undef ALLEGRO_XWINDOWS_WITH_SHM
! 
! /* Define if XCursor ARGB extension is available. */
! #undef ALLEGRO_XWINDOWS_WITH_XCURSOR
! 
! /* Define if DGA version 2.0 or newer is supported */
! #undef ALLEGRO_XWINDOWS_WITH_XF86DGA2
! 
! /* Define if XF86VidMode extension is supported. */
! #undef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
! 
! /* Define if xpm bitmap support is available. */
! #undef ALLEGRO_XWINDOWS_WITH_XPM
! 
! /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
!    */
  #undef HAVE_DIRENT_H
  
! /* Define to 1 if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H
  
! /* Define to 1 if you have the <fcntl.h> header file. */
  #undef HAVE_FCNTL_H
  
! /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
! /* Define to 1 if you have the `ossaudio' library (-lossaudio). */
! #undef HAVE_LIBOSSAUDIO
! 
! /* Define if you have the pthread library. */
  #undef HAVE_LIBPTHREAD
  
! /* Define to 1 if you have the <limits.h> header file. */
  #undef HAVE_LIMITS_H
  
! /* Define to 1 if you have the <linux/awe_voice.h> header file. */
! #undef HAVE_LINUX_AWE_VOICE_H
! 
! /* Define to 1 if you have the <linux/input.h> header file. */
! #undef HAVE_LINUX_INPUT_H
! 
! /* Define to 1 if you have the <linux/joystick.h> header file. */
  #undef HAVE_LINUX_JOYSTICK_H
  
! /* Define to 1 if you have the <linux/soundcard.h> header file. */
  #undef HAVE_LINUX_SOUNDCARD_H
  
! /* Define to 1 if you have the <machine/soundcard.h> header file. */
  #undef HAVE_MACHINE_SOUNDCARD_H
  
! /* Define to 1 if you have the `memcmp' function. */
  #undef HAVE_MEMCMP
  
! /* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H
  
! /* Define to 1 if you have the `mkstemp' function. */
  #undef HAVE_MKSTEMP
  
! /* Define to 1 if you have the `mmap' function. */
  #undef HAVE_MMAP
  
! /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
  #undef HAVE_NDIR_H
  
! /* Define to 1 if you have the <soundcard.h> header file. */
  #undef HAVE_SOUNDCARD_H
  
! /* Define to 1 if you have the <stdint.h> header file. */
! #undef HAVE_STDINT_H
! 
! /* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H
  
! /* Define to 1 if you have the `stricmp' function. */
  #undef HAVE_STRICMP
  
! /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
! /* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H
  
! /* Define to 1 if you have the `strlwr' function. */
  #undef HAVE_STRLWR
  
! /* Define to 1 if you have the `strupr' function. */
  #undef HAVE_STRUPR
  
! /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
!    */
  #undef HAVE_SYS_DIR_H
  
! /* Define to 1 if you have the <sys/io.h> header file. */
  #undef HAVE_SYS_IO_H
  
! /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
!    */
  #undef HAVE_SYS_NDIR_H
  
! /* Define to 1 if you have the <sys/soundcard.h> header file. */
  #undef HAVE_SYS_SOUNDCARD_H
  
! /* Define to 1 if you have the <sys/stat.h> header file. */
! #undef HAVE_SYS_STAT_H
! 
! /* Define to 1 if you have the <sys/time.h> header file. */
  #undef HAVE_SYS_TIME_H
  
! /* Define to 1 if you have the <sys/types.h> header file. */
! #undef HAVE_SYS_TYPES_H
! 
! /* Define to 1 if you have the <sys/utsname.h> header file. */
  #undef HAVE_SYS_UTSNAME_H
  
! /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
! /* Define to 1 if you have the `vprintf' function. */
  #undef HAVE_VPRINTF
  
+ /* Define to (void *)-1, if MAP_FAILED is not defined. */
+ #undef MAP_FAILED
+ 
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+ /* Define to the full name of this package. */
+ #undef PACKAGE_NAME
+ 
+ /* Define to the full name and version of this package. */
+ #undef PACKAGE_STRING
+ 
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
  /* Define as the return type of signal handlers (`int' or `void'). */
  #undef RETSIGTYPE
  
! /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  
! /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
  #undef TIME_WITH_SYS_TIME
  
! /* Define to 1 if your <sys/time.h> declares `struct tm'. */
  #undef TM_IN_SYS_TIME
  
! /* Define to 1 if your processor stores words with the most significant byte
!    first (like Motorola and SPARC, unlike Intel and VAX). */
  #undef WORDS_BIGENDIAN
  
***************
*** 206,212 ****
  #undef const
  
! /* Define as `__inline' if that's what the C compiler calls it, or to nothing
!    if it is not supported. */
  #undef inline
  
  /* Define to `unsigned' if <sys/types.h> does not define. */
--- 266,274 ----
  #undef const
  
! /* Define to `__inline__' or `__inline' if that's what the C compiler
!    calls it, or to nothing if 'inline' is not supported under any name.  */
! #ifndef __cplusplus
  #undef inline
+ #endif
  
  /* Define to `unsigned' if <sys/types.h> does not define. */

Index: aintwin.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintwin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aintwin.h	15 Nov 2003 01:37:37 -0000	1.4
--- aintwin.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 28,35 ****
  #endif
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  
  #include "winalleg.h"
--- 28,31 ----
***************
*** 50,56 ****
  
  
! /*******************************************/
! /***************** general *****************/
! /*******************************************/
  AL_VAR(HINSTANCE, allegro_inst);
  AL_VAR(HANDLE, allegro_thread);
--- 46,54 ----
  
  
! #ifdef __cplusplus
!    extern "C" {
! #endif
! 
! /* generals */
  AL_VAR(HINSTANCE, allegro_inst);
  AL_VAR(HANDLE, allegro_thread);
***************
*** 61,70 ****
  #define _exit_critical()   LeaveCriticalSection(&allegro_critical_section)
  
- 
  AL_FUNC(int, init_directx_window, (void));
  AL_FUNC(void, exit_directx_window, (void));
- AL_FUNC(int, wnd_call_proc, (AL_METHOD(int, proc, (void))));
  AL_FUNC(int, get_dx_ver, (void));
- AL_FUNC(void, set_sync_timer_freq, (int freq));
  AL_FUNC(int, adjust_window, (int w, int h));
  AL_FUNC(void, restore_window_style, (void));
--- 59,65 ----
***************
*** 75,79 ****
  #define WND_TITLE_SIZE  128
  
- AL_VAR(HWND, allegro_wnd);
  AL_ARRAY(char, wnd_title);
  AL_VAR(int, wnd_x);
--- 70,73 ----
***************
*** 96,164 ****
  #define GFX_CRITICAL_RELEASED  (!gfx_crit_sect_nesting)
  
- AL_FUNC(void, gfx_directx_restore, (void));
- 
  
! /* focus switch routines */
! AL_VAR(BOOL, app_foreground);
! AL_VAR(HANDLE, _foreground_event);
  
  AL_FUNC(void, sys_directx_display_switch_init, (void));
  AL_FUNC(void, sys_directx_display_switch_exit, (void));
  AL_FUNC(int, sys_directx_set_display_switch_mode, (int mode));
- AL_FUNC(int, sys_directx_set_display_switch_callback, (int dir, AL_METHOD(void, cb, (void))));
- AL_FUNC(void, sys_directx_remove_display_switch_callback, (AL_METHOD(void, cb, (void))));
  
! AL_FUNC(void, sys_switch_in, (void));
  
! AL_FUNC(void, sys_switch_out, (void));
! AL_FUNC(int, thread_switch_out, (void));
! AL_FUNC(void, midi_switch_out, (void));
  
- AL_FUNC(void, sys_directx_switch_out_callback, (void));
- AL_FUNC(void, sys_directx_switch_in_callback, (void));
  
  
  
! /*******************************************/
! /************** keyboard routines **********/
! /*******************************************/
! AL_VAR(HANDLE, key_thread);
  AL_FUNC(int, key_dinput_acquire, (void));
  AL_FUNC(int, key_dinput_unacquire, (void));
- AL_FUNC(void, wnd_acquire_keyboard, (void));
- AL_FUNC(void, wnd_unacquire_keyboard, (void));
  
  
! 
! /*******************************************/
! /************** mouse routines *************/
! /*******************************************/
! AL_VAR(HANDLE, mouse_thread);
  AL_FUNC(int, mouse_dinput_acquire, (void));
  AL_FUNC(int, mouse_dinput_unacquire, (void));
! AL_FUNC(int, mouse_set_syscursor, (int state));
  AL_FUNC(int, mouse_set_sysmenu, (int state));
- AL_FUNC(void, wnd_acquire_mouse, (void));
- AL_FUNC(void, wnd_unacquire_mouse, (void));
- AL_FUNC(void, wnd_set_syscursor, (int state));
  
  
  
! /*******************************************/
! /************* thread routines *************/
! /*******************************************/
! AL_FUNC(void, win_init_thread, (void));
! AL_FUNC(void, win_exit_thread, (void));
  
  
  
- /******************************************/
- /************* sound routines *************/
- /******************************************/
- AL_FUNC(_DRIVER_INFO *, _get_win_digi_driver_list, (void));
- AL_FUNC(_DRIVER_INFO *, _get_win_midi_driver_list, (void));
  
  AL_FUNC(void, _free_win_digi_driver_list, (void));
- AL_FUNC(void, _free_win_midi_driver_list, (void));
  
  AL_FUNC(DIGI_DRIVER *, _get_dsalmix_driver, (char *name, LPGUID guid, int num));
--- 90,179 ----
  #define GFX_CRITICAL_RELEASED  (!gfx_crit_sect_nesting)
  
  
! /* switch routines */
! AL_VAR(int, _win_app_foreground);
  
  AL_FUNC(void, sys_directx_display_switch_init, (void));
  AL_FUNC(void, sys_directx_display_switch_exit, (void));
  AL_FUNC(int, sys_directx_set_display_switch_mode, (int mode));
  
! AL_FUNC(void, _win_switch_in, (void));
! AL_FUNC(void, _win_switch_out, (void));
! AL_FUNC(void, _win_reset_switch_mode, (void));
  
! AL_FUNC(int, _win_thread_switch_out, (void));
  
  
+ /* main window routines */
+ AL_FUNC(int, wnd_call_proc, (int (*proc)(void)));
+ AL_FUNC(void, wnd_schedule_proc, (int (*proc)(void)));
  
  
! /* input routines */
! AL_VAR(int, _win_input_events);
! AL_ARRAY(HANDLE, _win_input_event_id);
! AL_FUNCPTRARRAY(void, _win_input_event_handler, (void));
! 
! AL_FUNC(void, _win_input_init, (int need_thread));
! AL_FUNC(void, _win_input_exit, (void));
! AL_FUNC(int, _win_input_register_event, (HANDLE event_id, void (*event_handler)(void)));
! AL_FUNC(void, _win_input_unregister_event, (HANDLE event_id));
! 
! 
! /* keyboard routines */
  AL_FUNC(int, key_dinput_acquire, (void));
  AL_FUNC(int, key_dinput_unacquire, (void));
  
  
! /* mouse routines */
! AL_VAR(HCURSOR, _win_hcursor);
  AL_FUNC(int, mouse_dinput_acquire, (void));
  AL_FUNC(int, mouse_dinput_unacquire, (void));
! AL_FUNC(int, mouse_dinput_grab, (void));
! AL_FUNC(int, mouse_set_syscursor, (void));
  AL_FUNC(int, mouse_set_sysmenu, (int state));
  
  
+ /* joystick routines */
+ #define WINDOWS_MAX_AXES   6
  
! #define WINDOWS_JOYSTICK_INFO_MEMBERS        \
!    int caps;                                 \
!    int num_axes;                             \
!    int axis[WINDOWS_MAX_AXES];               \
!    char *axis_name[WINDOWS_MAX_AXES];        \
!    int hat;                                  \
!    char *hat_name;                           \
!    int num_buttons;                          \
!    int button[MAX_JOYSTICK_BUTTONS];         \
!    char *button_name[MAX_JOYSTICK_BUTTONS];
  
+ typedef struct WINDOWS_JOYSTICK_INFO {
+    WINDOWS_JOYSTICK_INFO_MEMBERS
+ } WINDOWS_JOYSTICK_INFO;
  
+ AL_FUNC(int, win_add_joystick, (WINDOWS_JOYSTICK_INFO *win_joy));
+ AL_FUNC(void, win_remove_all_joysticks, (void));
+ AL_FUNC(int, win_update_joystick_status, (int n, WINDOWS_JOYSTICK_INFO *win_joy));
+ 
+ AL_FUNC(int, joystick_dinput_acquire, (void));
+ AL_FUNC(int, joystick_dinput_unacquire, (void));
+ 
+ 
+ /* thread routines */
+ AL_FUNC(void, _win_thread_init, (void));
+ AL_FUNC(void, _win_thread_exit, (void));
+ 
+ 
+ /* synchronization routines */
+ AL_FUNC(void *, sys_directx_create_mutex, (void));
+ AL_FUNC(void, sys_directx_destroy_mutex, (void *handle));
+ AL_FUNC(void, sys_directx_lock_mutex, (void *handle));
+ AL_FUNC(void, sys_directx_unlock_mutex, (void *handle));
  
  
+ /* sound routines */
+ AL_FUNC(_DRIVER_INFO *, _get_win_digi_driver_list, (void));
  AL_FUNC(void, _free_win_digi_driver_list, (void));
  
  AL_FUNC(DIGI_DRIVER *, _get_dsalmix_driver, (char *name, LPGUID guid, int num));
***************
*** 176,183 ****
  
  
  
! /*******************************************/
! /************* error handling **************/
! /*******************************************/
  AL_FUNC(char* , win_err_str, (long err));
  AL_FUNC(void, thread_safe_trace, (char *msg, ...));
--- 191,202 ----
  
  
+ /* midi routines */
+ AL_FUNC(_DRIVER_INFO *, _get_win_midi_driver_list, (void));
+ AL_FUNC(void, _free_win_midi_driver_list, (void));
  
! AL_FUNC(void, midi_switch_out, (void));
! 
! 
! /* error handling */
  AL_FUNC(char* , win_err_str, (long err));
  AL_FUNC(void, thread_safe_trace, (char *msg, ...));
***************
*** 190,198 ****
  
  
- 
  #ifdef __cplusplus
     }
  #endif
  
! #endif          /* ifndef AINTWIN_H */
  
--- 209,216 ----
  
  
  #ifdef __cplusplus
     }
  #endif
  
! #endif          /* !defined AINTWIN_H */
  

Index: aintqnx.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintqnx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintqnx.h	8 Jun 2003 19:24:57 -0000	1.3
--- aintqnx.h	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 34,37 ****
--- 34,67 ----
  
  
+ /* from qphaccel.c */
+ AL_FUNC(void, enable_acceleration, (GFX_DRIVER * drv));
+ AL_FUNC(void, enable_triple_buffering, (GFX_DRIVER *drv));
+ 
+ 
+ /* from qphbmp.c */
+ typedef struct BMP_EXTRA_INFO {
+    PdOffscreenContext_t *context;
+ } BMP_EXTRA_INFO;
+ 
+ #define BMP_EXTRA(bmp) ((BMP_EXTRA_INFO *)(bmp->extra))
+ 
+ AL_VAR(BITMAP *, ph_frontbuffer);
+ 
+ AL_FUNC(uintptr_t, ph_write_line, (BITMAP *bmp, int lyne));
+ AL_FUNC(uintptr_t, ph_write_line_asm, (BITMAP *bmp, int lyne));
+ AL_FUNC(void, ph_unwrite_line, (BITMAP *bmp, int lyne));
+ AL_FUNC(void, ph_unwrite_line_asm, (BITMAP *bmp, int lyne));
+ AL_FUNC(void, ph_acquire, (BITMAP *bmp));
+ AL_FUNC(void, ph_release, (BITMAP *bmp));
+ AL_FUNC(BITMAP *, make_photon_bitmap, (PdOffscreenContext_t *context, int w, int h, int id));
+ AL_FUNC(void, destroy_photon_bitmap, (BITMAP *bmp));
+ AL_FUNC(void, qnx_ph_created_sub_bitmap, (BITMAP *bmp, BITMAP *parent));
+ AL_FUNC(BITMAP *, qnx_ph_create_video_bitmap, (int width, int height));
+ AL_FUNC(void, qnx_ph_destroy_video_bitmap, (BITMAP *bmp));
+ AL_FUNC(int, qnx_ph_show_video_bitmap, (BITMAP *bmp));
+ AL_FUNC(int, qnx_ph_request_video_bitmap, (BITMAP *bmp));
+ 
+ 
+ /* from qphoton.c */
  #define PH_GFX_NONE       0
  #define PH_GFX_WINDOW     1
***************
*** 39,48 ****
  #define PH_GFX_OVERLAY    3
  
- /* from qphoton.c */
  AL_VAR(int, ph_gfx_mode);
! AL_FUNCPTR(void, ph_update_window, (PhRect_t* rect));
! AL_VAR(PdOffscreenContext_t, *ph_window_context);
  AL_ARRAY(PgColor_t, ph_palette);
  
  /* from qsystem.c */
  AL_VAR(PtWidget_t, *ph_window);
--- 69,86 ----
  #define PH_GFX_OVERLAY    3
  
  AL_VAR(int, ph_gfx_mode);
! AL_VAR(PgVideoModeInfo_t, ph_gfx_mode_info);
  AL_ARRAY(PgColor_t, ph_palette);
  
+ AL_FUNC(void, setup_direct_shifts, (void));
+ AL_FUNC(void, setup_driver, (GFX_DRIVER *drv, int w, int h, int color_depth));
+ 
+ 
+ /* from qphwin.c */
+ AL_VAR(BITMAP *, pseudo_screen);
+ 
+ AL_FUNCPTR(void, ph_update_window, (PhRect_t* rect));
+ 
+ 
  /* from qsystem.c */
  AL_VAR(PtWidget_t, *ph_window);
***************
*** 50,57 ****
--- 88,97 ----
  AL_VAR(pthread_mutex_t, qnx_gfx_mutex);
  
+ 
  /* from qkeydrv.c */
  AL_FUNC(void, qnx_keyboard_handler, (int, int));
  AL_FUNC(void, qnx_keyboard_focused, (int, int));
  
+ 
  /* from qmouse.c */
  AL_VAR(int, qnx_mouse_warped);

Index: aintunix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintunix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aintunix.h	15 Nov 2003 01:37:37 -0000	1.4
--- aintunix.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 23,27 ****
  #endif
  
! #ifndef HAVE_LIBPTHREAD
     /* Asynchronous event processing with SIGALRM */
     AL_FUNC(void, _sigalrm_request_abort, (void));
--- 23,33 ----
  #endif
  
! #ifdef HAVE_LIBPTHREAD
!    /* Synchronization routines using POSIX threads */
!    AL_FUNC(void *, _unix_create_mutex, (void));
!    AL_FUNC(void, _unix_destroy_mutex, (void *handle));
!    AL_FUNC(void, _unix_lock_mutex, (void *handle));
!    AL_FUNC(void, _unix_unlock_mutex, (void *handle));
! #else
     /* Asynchronous event processing with SIGALRM */
     AL_FUNC(void, _sigalrm_request_abort, (void));
***************
*** 43,47 ****
  
     /* Helper for setting os_type */
!    AL_FUNC(void, _read_os_type, (void));
  
  
--- 49,53 ----
  
     /* Helper for setting os_type */
!    AL_FUNC(void, _unix_read_os_type, (void));
  
  
***************
*** 50,55 ****
  
  
     /* Module support */
!    AL_FUNC(void, _unix_load_modules, (int system_driver));
     AL_FUNC(void, _unix_unload_modules, (void));
  
--- 56,65 ----
  
  
+    /* Unix rest function */
+    AL_FUNC(void, _unix_rest, (unsigned int, AL_METHOD(void, callback, (void))));
+ 
+ 
     /* Module support */
!    AL_FUNC(void, _unix_load_modules, (int system_driver_id));
     AL_FUNC(void, _unix_unload_modules, (void));
  
***************
*** 78,89 ****
  
     AL_FUNC(void, _xwin_handle_input, (void));
  
  
     #define XLOCK()                              \
        do {                                      \
-          if (_unix_bg_man->multi_threaded) {    \
-             if (_xwin.display)                  \
-                XLockDisplay(_xwin.display);     \
-          }                                      \
           _xwin.lock_count++;                    \
        } while (0)
--- 88,99 ----
  
     AL_FUNC(void, _xwin_handle_input, (void));
+    AL_FUNC(void, _xwin_private_handle_input, (void));
  
+ #ifndef ALLEGRO_MULTITHREADED
+ 
+    AL_VAR(int, _xwin_missed_input);
  
     #define XLOCK()                              \
        do {                                      \
           _xwin.lock_count++;                    \
        } while (0)
***************
*** 91,105 ****
     #define XUNLOCK()                            \
        do {                                      \
!          if (_unix_bg_man->multi_threaded) {    \
!             if (_xwin.display)                  \
!                XUnlockDisplay(_xwin.display);   \
           }                                      \
           _xwin.lock_count--;                    \
        } while (0)
  
  #endif
  
  
! #ifdef DIGI_OSS
     /* So the setup program can read what we detected */
     AL_VAR(int, _oss_fragsize);
--- 101,138 ----
     #define XUNLOCK()                            \
        do {                                      \
!          if (_xwin.lock_count == 1) {           \
!             while(_xwin_missed_input) {         \
!                if (_xwin_input_handler)         \
!                   _xwin_input_handler();        \
!                else                             \
!                   _xwin_private_handle_input(); \
!                --_xwin_missed_input;            \
!             }                                   \
           }                                      \
           _xwin.lock_count--;                    \
        } while (0)
  
+ #else
+ 
+    #define XLOCK()                              \
+       do {                                      \
+          if (_xwin.mutex)                       \
+             _unix_lock_mutex (_xwin.mutex);     \
+          _xwin.lock_count++;                    \
+       } while (0)
+ 
+    #define XUNLOCK()                            \
+       do {                                      \
+          if (_xwin.mutex)                       \
+             _unix_unlock_mutex (_xwin.mutex);   \
+          _xwin.lock_count--;                    \
+       } while (0)
+ 
  #endif
  
+ #endif
  
! 
! #ifdef ALLEGRO_WITH_OSSDIGI
     /* So the setup program can read what we detected */
     AL_VAR(int, _oss_fragsize);
***************
*** 108,111 ****
--- 141,149 ----
  
  
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+ 
  #ifdef ALLEGRO_LINUX
     #include "aintlnx.h"
***************
*** 113,116 ****
--- 151,158 ----
  
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /* Typedef for background functions, called frequently in the background.
   * `threaded' is nonzero if the function is being called from a thread.
***************
*** 143,145 ****
  
  #endif /* ifndef AINTUNIX_H */
- 
--- 185,186 ----

Index: alunix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alunix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alunix.h	15 Nov 2003 01:37:38 -0000	1.4
--- alunix.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 16,21 ****
   */
  
- #ifndef _ALLEGRO_ALUNIX_H
- #define _ALLEGRO_ALUNIX_H
  
  #ifndef ALLEGRO_UNIX
--- 16,19 ----
***************
*** 24,60 ****
  
  
- 
- /**************************************/
- /************ General Unix ************/
- /**************************************/
- 
- #define ALLEGRO_CONSOLE_OK
- #define ALLEGRO_VRAM_SINGLE_SURFACE
- 
  /* magic to capture name of executable file */
  extern int    __crt0_argc;
  extern char **__crt0_argv;
  
! #ifndef USE_CONSOLE
!    #define ALLEGRO_MAGIC_MAIN
!    #define main _mangled_main
!    #undef END_OF_MAIN
!    #define END_OF_MAIN() void *_mangled_main_address = (void*) _mangled_main;
! #else
!    #undef END_OF_MAIN
!    #define END_OF_MAIN() void *_mangled_main_address;
  #endif
  
  
! #ifdef HAVE_LIBPTHREAD
  
  #define TIMERDRV_UNIX_PTHREADS	AL_ID('P','T','H','R')
! AL_VAR(TIMER_DRIVER, timerdrv_unix_pthreads);
  
- #else
  
! #define TIMERDRV_UNIX_SIGALRM    AL_ID('A','L','R','M')
  AL_VAR(TIMER_DRIVER, timerdrv_unix_sigalrm);
- 
  #endif
  
--- 22,57 ----
  
  
  /* magic to capture name of executable file */
  extern int    __crt0_argc;
  extern char **__crt0_argv;
  
! #ifdef ALLEGRO_WITH_MAGIC_MAIN
! 
!    #ifndef ALLEGRO_NO_MAGIC_MAIN
!       #define ALLEGRO_MAGIC_MAIN
!       #define main _mangled_main
!       #undef END_OF_MAIN
!       #define END_OF_MAIN() void *_mangled_main_address = (void*) _mangled_main;
!    #else
!       #undef END_OF_MAIN
!       #define END_OF_MAIN() void *_mangled_main_address;
!    #endif
! 
  #endif
  
  
! 
! /**************************************/
! /************ General Unix ************/
! /**************************************/
  
  #define TIMERDRV_UNIX_PTHREADS	AL_ID('P','T','H','R')
! #define TIMERDRV_UNIX_SIGALRM    AL_ID('A','L','R','M')
  
  
! #ifdef HAVE_LIBPTHREAD
! AL_VAR(TIMER_DRIVER, timerdrv_unix_pthreads);
! #else
  AL_VAR(TIMER_DRIVER, timerdrv_unix_sigalrm);
  #endif
  
***************
*** 65,150 ****
  /************************************/
  
- #ifdef ALLEGRO_WITH_OSSDIGI
- 
  #define DIGI_OSS              AL_ID('O','S','S','D')
  
- AL_VAR(DIGI_DRIVER, digi_oss);
  
  #define DIGI_DRIVER_OSS                                          \
        {  DIGI_OSS,        &digi_oss,            TRUE  },
- 
  #endif /* ALLEGRO_WITH_OSSDIGI */
  
  #ifdef ALLEGRO_WITH_OSSMIDI
- 
- #define MIDI_OSS              AL_ID('O','S','S','M')
- 
  AL_VAR(MIDI_DRIVER, midi_oss);
- 
  #define MIDI_DRIVER_OSS                                          \
        {  MIDI_OSS,        &midi_oss,            TRUE  },
- 
  #endif /* ALLEGRO_WITH_OSSMIDI */
  
- #ifdef ALLEGRO_WITH_ESDDIGI
- 
- #define DIGI_ESD              AL_ID('E','S','D','D')
- 
  #ifndef ALLEGRO_WITH_MODULES
  
  AL_VAR(DIGI_DRIVER, digi_esd);
- 
  #define DIGI_DRIVER_ESD                                          \
        {  DIGI_ESD,        &digi_esd,            TRUE  },
- 
- #endif
- 
  #endif /* ALLEGRO_WITH_ESDDIGI */
  
  #ifdef ALLEGRO_WITH_ARTSDIGI
- 
- #define DIGI_ARTS             AL_ID('A','R','T','S')
- 
- #ifndef ALLEGRO_WITH_MODULES
- 
  AL_VAR(DIGI_DRIVER, digi_arts);
- 
  #define DIGI_DRIVER_ARTS                                         \
        {  DIGI_ARTS,       &digi_arts,            TRUE  },
- 
- #endif
- 
  #endif /* ALLEGRO_WITH_ARTSDIGI */
  
! #ifdef ALLEGRO_WITH_ALSADIGI
! 
! #define DIGI_ALSA             AL_ID('A','L','S','A')
! 
! #ifndef ALLEGRO_WITH_MODULES
  
  AL_VAR(DIGI_DRIVER, digi_alsa);
- 
  #define DIGI_DRIVER_ALSA                                         \
        {  DIGI_ALSA,       &digi_alsa,           TRUE  },
- 
- #endif
-       
  #endif /* ALLEGRO_WITH_ALSADIGI */
  
  
  #ifdef ALLEGRO_WITH_ALSAMIDI
- 
- #define MIDI_ALSA              AL_ID('A','M','I','D')
- 
- #ifndef ALLEGRO_WITH_MODULES
- 
  AL_VAR(MIDI_DRIVER, midi_alsa);
- 
  #define MIDI_DRIVER_ALSA                                          \
        {  MIDI_ALSA,        &midi_alsa,            TRUE  },
  
! #endif
  
! #endif /* ALLEGRO_WITH_ALSAMIDI */
  
  
--- 62,128 ----
  /************************************/
  
  #define DIGI_OSS              AL_ID('O','S','S','D')
+ #define MIDI_OSS              AL_ID('O','S','S','M')
+ #define DIGI_ESD              AL_ID('E','S','D','D')
+ #define DIGI_ARTS             AL_ID('A','R','T','S')
+ #define DIGI_SGIAL            AL_ID('S','G','I','A')
+ #define DIGI_ALSA             AL_ID('A','L','S','A')
+ #define MIDI_ALSA             AL_ID('A','M','I','D')
+ #define DIGI_JACK             AL_ID('J','A','C','K')
  
  
+ #ifdef ALLEGRO_WITH_OSSDIGI
+ AL_VAR(DIGI_DRIVER, digi_oss);
  #define DIGI_DRIVER_OSS                                          \
        {  DIGI_OSS,        &digi_oss,            TRUE  },
  #endif /* ALLEGRO_WITH_OSSDIGI */
  
  #ifdef ALLEGRO_WITH_OSSMIDI
  AL_VAR(MIDI_DRIVER, midi_oss);
  #define MIDI_DRIVER_OSS                                          \
        {  MIDI_OSS,        &midi_oss,            TRUE  },
  #endif /* ALLEGRO_WITH_OSSMIDI */
  
  #ifndef ALLEGRO_WITH_MODULES
  
+ #ifdef ALLEGRO_WITH_ESDDIGI
  AL_VAR(DIGI_DRIVER, digi_esd);
  #define DIGI_DRIVER_ESD                                          \
        {  DIGI_ESD,        &digi_esd,            TRUE  },
  #endif /* ALLEGRO_WITH_ESDDIGI */
  
  #ifdef ALLEGRO_WITH_ARTSDIGI
  AL_VAR(DIGI_DRIVER, digi_arts);
  #define DIGI_DRIVER_ARTS                                         \
        {  DIGI_ARTS,       &digi_arts,            TRUE  },
  #endif /* ALLEGRO_WITH_ARTSDIGI */
  
! #ifdef ALLEGRO_WITH_SGIALDIGI
! AL_VAR(DIGI_DRIVER, digi_sgial);
! #define DIGI_DRIVER_SGIAL                                        \
!       {  DIGI_SGIAL,      &digi_sgial,          TRUE  },
! #endif /* ALLEGRO_WITH_SGIALDIGI */
  
+ #ifdef ALLEGRO_WITH_ALSADIGI
  AL_VAR(DIGI_DRIVER, digi_alsa);
  #define DIGI_DRIVER_ALSA                                         \
        {  DIGI_ALSA,       &digi_alsa,           TRUE  },
  #endif /* ALLEGRO_WITH_ALSADIGI */
  
  
  #ifdef ALLEGRO_WITH_ALSAMIDI
  AL_VAR(MIDI_DRIVER, midi_alsa);
  #define MIDI_DRIVER_ALSA                                          \
        {  MIDI_ALSA,        &midi_alsa,            TRUE  },
+ #endif /* ALLEGRO_WITH_ALSAMIDI */
  
! 	  
! #ifdef ALLEGRO_WITH_JACKDIGI
! AL_VAR(DIGI_DRIVER, digi_jack);
! #define DIGI_DRIVER_JACK                                         \
!       {  DIGI_JACK,       &digi_jack,           TRUE  },
! #endif /* ALLEGRO_WITH_JACKDIGI */
  
! #endif
  
  
***************
*** 154,181 ****
  /************************************/
  
- #ifdef ALLEGRO_WITH_XWINDOWS
- 
- 
  #define SYSTEM_XWINDOWS          AL_ID('X','W','I','N')
- AL_VAR(SYSTEM_DRIVER, system_xwin);
  
- #define GFX_XWINDOWS             AL_ID('X','W','I','N')
- #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
- #define GFX_XWINDOWS_FULLSCREEN  AL_ID('X','W','F','S')
- #endif
  #define KEYBOARD_XWINDOWS        AL_ID('X','W','I','N')
  #define MOUSE_XWINDOWS           AL_ID('X','W','I','N')
  
! #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA
  #define GFX_XDGA                 AL_ID('X','D','G','A')
! #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
! #define GFX_XDGA_FULLSCREEN	 AL_ID('X','D','F','S')
! #endif
! #endif
! 
! #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA2
  #define GFX_XDGA2                AL_ID('D','G','A','2')
  #define GFX_XDGA2_SOFT           AL_ID('D','G','A','S')
  
  #ifndef ALLEGRO_WITH_MODULES
  AL_VAR(GFX_DRIVER, gfx_xdga2);
--- 132,152 ----
  /************************************/
  
  #define SYSTEM_XWINDOWS          AL_ID('X','W','I','N')
  
  #define KEYBOARD_XWINDOWS        AL_ID('X','W','I','N')
  #define MOUSE_XWINDOWS           AL_ID('X','W','I','N')
  
! #define GFX_XWINDOWS             AL_ID('X','W','I','N')
! #define GFX_XWINDOWS_FULLSCREEN  AL_ID('X','W','F','S')
  #define GFX_XDGA                 AL_ID('X','D','G','A')
! #define GFX_XDGA_FULLSCREEN      AL_ID('X','D','F','S')
  #define GFX_XDGA2                AL_ID('D','G','A','2')
  #define GFX_XDGA2_SOFT           AL_ID('D','G','A','S')
  
+ 
+ #ifdef ALLEGRO_WITH_XWINDOWS
+ AL_VAR(SYSTEM_DRIVER, system_xwin);
+ 
+ #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA2
  #ifndef ALLEGRO_WITH_MODULES
  AL_VAR(GFX_DRIVER, gfx_xdga2);
***************
*** 184,188 ****
  #endif
  
- 
  #endif /* ALLEGRO_WITH_XWINDOWS */
  
--- 155,158 ----
***************
*** 193,254 ****
  /****************************************/
  
! #ifdef ALLEGRO_LINUX
  
  
- #define SYSTEM_LINUX             AL_ID('L','N','X','C')
  AL_VAR(SYSTEM_DRIVER, system_linux);
  
  #ifdef ALLEGRO_LINUX_VGA
-    #define GFX_VGA                  AL_ID('V','G','A',' ')
-    #define GFX_MODEX                AL_ID('M','O','D','X')
     AL_VAR(GFX_DRIVER, gfx_vga);
     AL_VAR(GFX_DRIVER, gfx_modex);
  #endif
  
- #ifdef ALLEGRO_LINUX_FBCON
-    #define GFX_FBCON                AL_ID('F','B',' ',' ')
  #ifndef ALLEGRO_WITH_MODULES
-    AL_VAR(GFX_DRIVER, gfx_fbcon);
- #endif
- #endif
  
! #ifdef ALLEGRO_LINUX_VBEAF
!    #define GFX_VBEAF                AL_ID('V','B','A','F')
!    AL_VAR(GFX_DRIVER, gfx_vbeaf);
  #endif
- 
  #ifdef ALLEGRO_LINUX_SVGALIB
-    #define GFX_SVGALIB              AL_ID('S','V','G','A')
- #ifndef ALLEGRO_WITH_MODULES
     AL_VAR(GFX_DRIVER, gfx_svgalib);
  #endif
  #endif
  
! #define KEYDRV_LINUX             AL_ID('L','N','X','C')
! AL_VAR(KEYBOARD_DRIVER, keydrv_linux_console);
  
- #define MOUSEDRV_LINUX_PS2       AL_ID('L','P','S','2')
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ps2);
- 
- #define MOUSEDRV_LINUX_IPS2      AL_ID('L','I','P','S')
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ips2);
- 
- #define MOUSEDRV_LINUX_GPMDATA   AL_ID('G','P','M','D')
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_gpmdata);
- 
- #define MOUSEDRV_LINUX_MS        AL_ID('M','S',' ',' ')
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ms);
- 
- #define MOUSEDRV_LINUX_IMS       AL_ID('I','M','S',' ')
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ims);
  
! #define JOY_TYPE_LINUX_ANALOGUE  AL_ID('L','N','X','A')
! AL_VAR(JOYSTICK_DRIVER, joystick_linux_analogue);
  
  
! AL_FUNC(void, split_modex_screen, (int line));
  
  
! /* Port I/O functions -- maybe these should be internal */
  
  static INLINE void outportb(unsigned short port, unsigned char value)
--- 163,229 ----
  /****************************************/
  
! #define SYSTEM_LINUX             AL_ID('L','N','X','C')
  
+ #define GFX_VGA                  AL_ID('V','G','A',' ')
+ #define GFX_MODEX                AL_ID('M','O','D','X')
+ #define GFX_FBCON                AL_ID('F','B',' ',' ')
+ #define GFX_VBEAF                AL_ID('V','B','A','F')
+ #define GFX_SVGALIB              AL_ID('S','V','G','A')
+ 
+ #define KEYDRV_LINUX             AL_ID('L','N','X','C')
+ 
+ #define MOUSEDRV_LINUX_PS2       AL_ID('L','P','S','2')
+ #define MOUSEDRV_LINUX_IPS2      AL_ID('L','I','P','S')
+ #define MOUSEDRV_LINUX_GPMDATA   AL_ID('G','P','M','D')
+ #define MOUSEDRV_LINUX_MS        AL_ID('M','S',' ',' ')
+ #define MOUSEDRV_LINUX_IMS       AL_ID('I','M','S',' ')
+ #define MOUSEDRV_LINUX_EVDEV     AL_ID('E','V',' ',' ')
+ 
+ #define JOY_TYPE_LINUX_ANALOGUE  AL_ID('L','N','X','A')
+ 
+ 
+ #ifdef ALLEGRO_LINUX
  
  AL_VAR(SYSTEM_DRIVER, system_linux);
  
  #ifdef ALLEGRO_LINUX_VGA
     AL_VAR(GFX_DRIVER, gfx_vga);
     AL_VAR(GFX_DRIVER, gfx_modex);
+    #define GFX_HAS_VGA
  #endif
  
  #ifndef ALLEGRO_WITH_MODULES
  
! #ifdef ALLEGRO_LINUX_FBCON
!    AL_VAR(GFX_DRIVER, gfx_fbcon);
  #endif
  #ifdef ALLEGRO_LINUX_SVGALIB
     AL_VAR(GFX_DRIVER, gfx_svgalib);
  #endif
+ 
  #endif
  
! #ifdef ALLEGRO_LINUX_VBEAF
!    AL_VAR(GFX_DRIVER, gfx_vbeaf);
!    #define GFX_HAS_VBEAF
! #endif
  
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ps2);
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ips2);
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_gpmdata);
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ms);
  AL_VAR(MOUSE_DRIVER, mousedrv_linux_ims);
+ AL_VAR(MOUSE_DRIVER, mousedrv_linux_evdev);
  
! AL_FUNC_DEPRECATED(void, split_modex_screen, (int lyne));
  
  
! /* Port I/O functions -- maybe these should be internal */
  
+ #ifdef ALLEGRO_LINUX_VGA
  
! #ifdef __cplusplus
! extern "C" {
! #endif
  
  static INLINE void outportb(unsigned short port, unsigned char value)
***************
*** 288,296 ****
  }
  
  
! #endif /* ALLEGRO_LINUX */
! 
! 
  
- #endif /* !_ALLEGRO_ALUNIX_H */
  
--- 263,272 ----
  }
  
+ #ifdef __cplusplus
+ }
+ #endif
  
! #endif /* ALLEGRO_LINUX_VGA */
  
  
+ #endif /* ALLEGRO_LINUX */

Index: alqnxcfg.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alqnxcfg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alqnxcfg...
 
[truncated message content]

[Timewarp-commit] include/allegro 3d.h, 1.3, 1.4 3dmaths.h, 1.3, 1.4 alcompat.h, 1.4, 1.5 alinline.h, 1.3, 1.4 base.h, 1.4, 1.5 color.h, 1.3, 1.4 compiled.h, 1.3, 1.4 config.h, 1.3, 1.4 datafile.h, 1.4, 1.5 debug.h, 1.3, 1.4 digi.h, 1.3, 1.4 draw.h, 1.3, 1.4 file.h, 1.3, 1.4 fix.h, 1.4, 1.5 fixed.h, 1.3, 1.4 fli.h, 1.3, 1.4 fmaths.h, 1.3, 1.4 gfx.h, 1.4, 1.5 gui.h, 1.3, 1.4 joystick.h, 1.3, 1.4 keyboard.h, 1.3, 1.4 matrix.h, 1.3, 1.4 midi.h, 1.3, 1.4 mouse.h, 1.3, 1.4 quat.h, 1.3, 1.4 rle.h, 1.4, 1.5 sound.h, 1.3, 1.4 stream.h, 1.3, 1.4 system.h, 1.4, 1.5 text.h, 1.4, 1.5 timer.h, 1.3, 1.4 unicode.h, 1.3, 1.4

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20384/include/allegro

Modified Files:
	3d.h 3dmaths.h alcompat.h alinline.h base.h color.h compiled.h 
	config.h datafile.h debug.h digi.h draw.h file.h fix.h fixed.h 
	fli.h fmaths.h gfx.h gui.h joystick.h keyboard.h matrix.h 
	midi.h mouse.h quat.h rle.h sound.h stream.h system.h text.h 
	timer.h unicode.h 
Log Message:


Index: rle.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/rle.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rle.h	15 Nov 2003 01:37:38 -0000	1.4
--- rle.h	2 Jun 2006 14:30:33 -0000	1.5
***************
*** 20,30 ****
  #define ALLEGRO_RLE_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- #include "gfx.h"
- 
  typedef struct RLE_SPRITE           /* a RLE compressed sprite */
  {
--- 20,30 ----
  #define ALLEGRO_RLE_H
  
+ #include "base.h"
+ #include "gfx.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  typedef struct RLE_SPRITE           /* a RLE compressed sprite */
  {
***************
*** 39,48 ****
  AL_FUNC(void, destroy_rle_sprite, (RLE_SPRITE *sprite));
  
- #include "inline/rle.inl"
- 
  #ifdef __cplusplus
     }
  #endif
  
  #endif          /* ifndef ALLEGRO_RLE_H */
  
--- 39,48 ----
  AL_FUNC(void, destroy_rle_sprite, (RLE_SPRITE *sprite));
  
  #ifdef __cplusplus
     }
  #endif
  
+ #include "inline/rle.inl"
+ 
  #endif          /* ifndef ALLEGRO_RLE_H */
  

Index: alinline.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/alinline.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alinline.h	8 Jun 2003 19:24:56 -0000	1.3
--- alinline.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 25,39 ****
  #include "inline/draw.inl"
  
- #include "inline/file.inl"
- 
  #include "inline/fmaths.inl"
  
- #include "inline/gui.inl"
- 
  #include "inline/3dmaths.inl"
  
  #include "inline/matrix.inl"
  
! #ifndef ALLEGRO_LIB_BUILD
!    #include "alcompat.h"
! #endif
--- 25,34 ----
  #include "inline/draw.inl"
  
  #include "inline/fmaths.inl"
  
  #include "inline/3dmaths.inl"
  
  #include "inline/matrix.inl"
  
! /* alcompat.h includes some inline functions */
! #include "alcompat.h"

Index: fli.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/fli.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fli.h	8 Jun 2003 19:24:56 -0000	1.3
--- fli.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,30 ****
  #define ALLEGRO_FLI_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- #include "palette.h"
- 
  struct BITMAP;
  
--- 20,30 ----
  #define ALLEGRO_FLI_H
  
+ #include "base.h"
+ #include "palette.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  struct BITMAP;
  

Index: alcompat.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/alcompat.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alcompat.h	15 Nov 2003 01:37:38 -0000	1.4
--- alcompat.h	2 Jun 2006 14:30:33 -0000	1.5
***************
*** 25,78 ****
  
  
! #ifndef ALLEGRO_NO_CLEAR_BITMAP_ALIAS
!    #if (defined ALLEGRO_GCC)
!       static __attribute__((unused)) __inline__ void clear(BITMAP *bmp)
!       {
!          clear_bitmap(bmp);
!       }
!    #else
!       static INLINE void clear(BITMAP *bmp)
!       {
!          clear_bitmap(bmp);
!       }
     #endif
- #endif
  
! #ifndef ALLEGRO_NO_FIX_ALIASES
!    #if (defined ALLEGRO_GCC)
!       #define AL_ALIAS(DECL, CALL)                      \
!       static __attribute__((unused)) __inline__ DECL    \
!       {                                                 \
!          return CALL;                                   \
!       }
!    #else
!       #define AL_ALIAS(DECL, CALL)              \
!       static INLINE DECL                        \
!       {                                         \
!          return CALL;                           \
!       }
     #endif
!    AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
!    AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
!    AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
!    AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
!    AL_ALIAS(int fceil(fixed x), fixceil(x))
!    AL_ALIAS(int ffloor(fixed x), fixfloor(x))
!    AL_ALIAS(fixed fcos(fixed x), fixcos(x))
!    AL_ALIAS(fixed fsin(fixed x), fixsin(x))
!    AL_ALIAS(fixed ftan(fixed x), fixtan(x))
!    AL_ALIAS(fixed facos(fixed x), fixacos(x))
!    AL_ALIAS(fixed fasin(fixed x), fixasin(x))
!    AL_ALIAS(fixed fatan(fixed x), fixatan(x))
!    AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
!    AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
!    AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
!    #undef AL_ALIAS
! #endif
  
  #define KB_NORMAL       1
  #define KB_EXTENDED     2
  
! #define SEND_MESSAGE        object_message
  
  #define cpu_fpu         (cpu_capabilities & CPU_FPU)
--- 25,69 ----
  
  
! #ifndef ALLEGRO_LIB_BUILD
! 
!    #ifndef ALLEGRO_NO_CLEAR_BITMAP_ALIAS
!       #if (defined ALLEGRO_GCC)
!          static __attribute__((unused)) __inline__ void clear(BITMAP *bmp)
!          {
!             clear_bitmap(bmp);
!          }
!       #else
!          static INLINE void clear(BITMAP *bmp)
!          {
!             clear_bitmap(bmp);
!          }
!       #endif
     #endif
  
!    #ifndef ALLEGRO_NO_FIX_ALIASES
!       AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
!       AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
!       AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
!       AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
!       AL_ALIAS(int fceil(fixed x), fixceil(x))
!       AL_ALIAS(int ffloor(fixed x), fixfloor(x))
!       AL_ALIAS(fixed fcos(fixed x), fixcos(x))
!       AL_ALIAS(fixed fsin(fixed x), fixsin(x))
!       AL_ALIAS(fixed ftan(fixed x), fixtan(x))
!       AL_ALIAS(fixed facos(fixed x), fixacos(x))
!       AL_ALIAS(fixed fasin(fixed x), fixasin(x))
!       AL_ALIAS(fixed fatan(fixed x), fixatan(x))
!       AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
!       AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
!       AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
     #endif
! 
! #endif  /* !defined ALLEGRO_LIB_BUILD */
! 
  
  #define KB_NORMAL       1
  #define KB_EXTENDED     2
  
! #define SEND_MESSAGE    object_message
  
  #define cpu_fpu         (cpu_capabilities & CPU_FPU)
***************
*** 120,123 ****
--- 111,116 ----
  #define JOY_HAT_UP            4
  
+ AL_FUNC_DEPRECATED(int, initialise_joystick, (void));
+ 
  
  /* in case you want to spell 'palette' as 'pallete' */
***************
*** 138,141 ****
--- 131,231 ----
  
  
+ /* a pretty vague name */
+ #define fix_filename_path              canonicalize_filename
+ 
+ 
+ /* the good old file selector */
+ #define OLD_FILESEL_WIDTH   -1
+ #define OLD_FILESEL_HEIGHT  -1
+ 
+ AL_INLINE_DEPRECATED(int, file_select, (AL_CONST char *message, char *path, AL_CONST char *ext),
+ {
+    return file_select_ex(message, path, ext, 1024, OLD_FILESEL_WIDTH, OLD_FILESEL_HEIGHT);
+ })
+ 
+ 
+ /* the old (and broken!) file enumeration function */
+ AL_FUNC_DEPRECATED(int, for_each_file, (AL_CONST char *name, int attrib, AL_METHOD(void, callback, (AL_CONST char *filename, int attrib, int param)), int param));
+ 
+ 
+ /* the old state-based textout functions */
+ AL_VAR(int, _textmode);
+ AL_FUNC_DEPRECATED(int, text_mode, (int mode));
+ 
+ AL_INLINE_DEPRECATED(void, textout, (struct BITMAP *bmp, AL_CONST FONT *f, AL_CONST char *str, int x, int y, int color),
+ {
+    textout_ex(bmp, f, str, x, y, color, _textmode);
+ })
+ 
+ AL_INLINE_DEPRECATED(void, textout_centre, (struct BITMAP *bmp, AL_CONST FONT *f, AL_CONST char *str, int x, int y, int color),
+ {
+    textout_centre_ex(bmp, f, str, x, y, color, _textmode);
+ })
+ 
+ AL_INLINE_DEPRECATED(void, textout_right, (struct BITMAP *bmp, AL_CONST FONT *f, AL_CONST char *str, int x, int y, int color),
+ {
+    textout_right_ex(bmp, f, str, x, y, color, _textmode);
+ })
+ 
+ AL_INLINE_DEPRECATED(void, textout_justify, (struct BITMAP *bmp, AL_CONST FONT *f, AL_CONST char *str, int x1, int x2, int y, int diff, int color),
+ {
+    textout_justify_ex(bmp, f, str, x1, x2, y, diff, color, _textmode);
+ })
+ 
+ AL_PRINTFUNC_DEPRECATED(void, textprintf, (struct BITMAP *bmp, AL_CONST FONT *f, int x, int y, int color, AL_CONST char *format, ...), 6, 7);
+ AL_PRINTFUNC_DEPRECATED(void, textprintf_centre, (struct BITMAP *bmp, AL_CONST FONT *f, int x, int y, int color, AL_CONST char *format, ...), 6, 7);
+ AL_PRINTFUNC_DEPRECATED(void, textprintf_right, (struct BITMAP *bmp, AL_CONST FONT *f, int x, int y, int color, AL_CONST char *format, ...), 6, 7);
+ AL_PRINTFUNC_DEPRECATED(void, textprintf_justify, (struct BITMAP *bmp, AL_CONST FONT *f, int x1, int x2, int y, int diff, int color, AL_CONST char *format, ...), 8, 9);
+ 
+ AL_INLINE_DEPRECATED(void, draw_character, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color),
+ {
+    draw_character_ex(bmp, sprite, x, y, color, _textmode);
+ })
+ 
+ AL_INLINE_DEPRECATED(int, gui_textout, (struct BITMAP *bmp, AL_CONST char *s, int x, int y, int color, int centre),
+ {
+    return gui_textout_ex(bmp, s, x, y, color, _textmode, centre);
+ })
+ 
+ 
+ /* the old close button functions */
+ AL_INLINE_DEPRECATED(int, set_window_close_button, (int enable),
+ {
+    (void)enable;
+    return 0;
+ })
+ 
+ AL_INLINE_DEPRECATED(void, set_window_close_hook, (void (*proc)(void)),
+ {
+    set_close_button_callback(proc);
+ })
+ 
+ 
+ /* the weird old clipping API */
+ AL_FUNC_DEPRECATED(void, set_clip, (BITMAP *bitmap, int x1, int y_1, int x2, int y2));
+ 
+ 
+ /* unnecessary, can use rest(0) */
+ AL_INLINE_DEPRECATED(void, yield_timeslice, (void),
+ {
+    ASSERT(system_driver);
+ 
+    if (system_driver->yield_timeslice)
+       system_driver->yield_timeslice();
+ })
+ 
+ 
+ /* DOS-ish monitor retrace ideas that don't work elsewhere */
+ AL_FUNCPTR(void, retrace_proc, (void));
+ 
+ #ifdef ALLEGRO_LIB_BUILD
+    AL_FUNC(int,  timer_can_simulate_retrace, (void));
+    AL_FUNC(void, timer_simulate_retrace, (int enable));
+ #else
+    AL_FUNC_DEPRECATED(int,  timer_can_simulate_retrace, (void));
+    AL_FUNC_DEPRECATED(void, timer_simulate_retrace, (int enable));
+ #endif
+ AL_FUNC_DEPRECATED(int,  timer_is_using_retrace, (void));
+ 
  #ifdef __cplusplus
     }
***************
*** 144,146 ****
  #endif          /* ifndef ALLEGRO_COMPAT_H */
  
- 
--- 234,235 ----

Index: joystick.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/joystick.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** joystick.h	8 Jun 2003 19:24:56 -0000	1.3
--- joystick.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_JOYSTICK_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  #define JOY_TYPE_AUTODETECT      -1
  #define JOY_TYPE_NONE            0
--- 20,29 ----
  #define ALLEGRO_JOYSTICK_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  #define JOY_TYPE_AUTODETECT      -1
  #define JOY_TYPE_NONE            0
***************
*** 33,37 ****
  #define MAX_JOYSTICK_AXIS        3
  #define MAX_JOYSTICK_STICKS      5
! #define MAX_JOYSTICK_BUTTONS     16
  
  
--- 33,37 ----
  #define MAX_JOYSTICK_AXIS        3
  #define MAX_JOYSTICK_STICKS      5
! #define MAX_JOYSTICK_BUTTONS     32
  
  
***************
*** 129,134 ****
  AL_FUNC(void, remove_joystick, (void));
  
- AL_FUNC(int, initialise_joystick, (void));
- 
  AL_FUNC(int, poll_joystick, (void));
  
--- 129,132 ----

Index: fix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/fix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fix.h	15 Nov 2003 01:37:38 -0000	1.4
--- fix.h	2 Jun 2006 14:30:33 -0000	1.5
***************
*** 20,28 ****
  #define ALLEGRO_FIX_H
  
- #ifdef __cplusplus
- 
  #include "fixed.h"
  #include "fmaths.h"
  
  class fix      /* C++ wrapper for the fixed point routines */
  {
--- 20,28 ----
  #define ALLEGRO_FIX_H
  
  #include "fixed.h"
  #include "fmaths.h"
  
+ #ifdef __cplusplus
+ 
  class fix      /* C++ wrapper for the fixed point routines */
  {
***************
*** 30,41 ****
     fixed v;
  
!    fix() : v(0)                              { }
!    fix(const fix &x) : v(x.v)                { }
!    fix(const int x) : v(itofix(x))           { }
!    fix(const long x) : v(itofix(x))          { }
!    fix(const unsigned int x) : v(itofix(x))  { }
!    fix(const unsigned long x) : v(itofix(x)) { }
!    fix(const float x) : v(ftofix(x))         { }
!    fix(const double x) : v(ftofix(x))        { }
  
     operator int() const                      { return fixtoi(v); }
--- 30,41 ----
     fixed v;
  
!    fix() : v(0)                                       {}
!    fix(const fix &x) : v(x.v)                         {}
!    explicit fix(const int x) : v(itofix(x))           {}
!    explicit fix(const long x) : v(itofix(x))          {}
!    explicit fix(const unsigned int x) : v(itofix(x))  {}
!    explicit fix(const unsigned long x) : v(itofix(x)) {}
!    explicit fix(const float x) : v(ftofix(x))         {}
!    explicit fix(const double x) : v(ftofix(x))        {}
  
     operator int() const                      { return fixtoi(v); }
***************
*** 202,209 ****
  };
  
- #include "inline/fix.inl"
- 
  #endif          /* ifdef __cplusplus */
  
  #endif          /* ifndef ALLEGRO_FIX_H */
  
--- 202,209 ----
  };
  
  #endif          /* ifdef __cplusplus */
  
+ #include "inline/fix.inl"
+ 
  #endif          /* ifndef ALLEGRO_FIX_H */
  

Index: fixed.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/fixed.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fixed.h	8 Jun 2003 19:24:56 -0000	1.3
--- fixed.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,28 ****
  #define ALLEGRO_FIXED_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
! typedef long fixed;
  
  #ifdef __cplusplus
--- 20,33 ----
  #define ALLEGRO_FIXED_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
! typedef int32_t fixed;
! 
! AL_VAR(AL_CONST fixed, fixtorad_r);
! AL_VAR(AL_CONST fixed, radtofix_r);
  
  #ifdef __cplusplus

Index: draw.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/draw.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** draw.h	8 Jun 2003 19:24:56 -0000	1.3
--- draw.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,31 ****
  #define ALLEGRO_DRAW_H
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #include "base.h"
  #include "fixed.h"
  #include "gfx.h"
  
  #define DRAW_MODE_SOLID             0        /* flags for drawing_mode() */
  #define DRAW_MODE_XOR               1
--- 20,31 ----
  #define ALLEGRO_DRAW_H
  
  #include "base.h"
  #include "fixed.h"
  #include "gfx.h"
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  #define DRAW_MODE_SOLID             0        /* flags for drawing_mode() */
  #define DRAW_MODE_XOR               1
***************
*** 38,56 ****
  AL_FUNC(void, xor_mode, (int on));
  AL_FUNC(void, solid_mode, (void));
! AL_FUNC(void, do_line, (struct BITMAP *bmp, int x1, int y1, int x2, int y2, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, triangle, (struct BITMAP *bmp, int x1, int y1, int x2, int y2, int x3, int y3, int color));
! AL_FUNC(void, polygon, (struct BITMAP *bmp, int vertices, AL_CONST int *points, int color));
! AL_FUNC(void, rect, (struct BITMAP *bmp, int x1, int y1, int x2, int y2, int color));
  AL_FUNC(void, do_circle, (struct BITMAP *bmp, int x, int y, int radius, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, circle, (struct BITMAP *bmp, int x, int y, int radius, int color));
! AL_FUNC(void, circlefill, (struct BITMAP *bmp, int x, int y, int radius, int color));
  AL_FUNC(void, do_ellipse, (struct BITMAP *bmp, int x, int y, int rx, int ry, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, ellipse, (struct BITMAP *bmp, int x, int y, int rx, int ry, int color));
! AL_FUNC(void, ellipsefill, (struct BITMAP *bmp, int x, int y, int rx, int ry, int color));
  AL_FUNC(void, do_arc, (struct BITMAP *bmp, int x, int y, fixed ang1, fixed ang2, int r, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, arc, (struct BITMAP *bmp, int x, int y, fixed ang1, fixed ang2, int r, int color));
  AL_FUNC(void, calc_spline, (AL_CONST int points[8], int npts, int *x, int *y));
! AL_FUNC(void, spline, (struct BITMAP *bmp, AL_CONST int points[8], int color));
! AL_FUNC(void, floodfill, (struct BITMAP *bmp, int x, int y, int color));
  AL_FUNC(void, blit, (struct BITMAP *source, struct BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, masked_blit, (struct BITMAP *source, struct BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 38,56 ----
  AL_FUNC(void, xor_mode, (int on));
  AL_FUNC(void, solid_mode, (void));
! AL_FUNC(void, do_line, (struct BITMAP *bmp, int x1, int y_1, int x2, int y2, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, _soft_triangle, (struct BITMAP *bmp, int x1, int y_1, int x2, int y2, int x3, int y3, int color));
! AL_FUNC(void, _soft_polygon, (struct BITMAP *bmp, int vertices, AL_CONST int *points, int color));
! AL_FUNC(void, _soft_rect, (struct BITMAP *bmp, int x1, int y_1, int x2, int y2, int color));
  AL_FUNC(void, do_circle, (struct BITMAP *bmp, int x, int y, int radius, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, _soft_circle, (struct BITMAP *bmp, int x, int y, int radius, int color));
! AL_FUNC(void, _soft_circlefill, (struct BITMAP *bmp, int x, int y, int radius, int color));
  AL_FUNC(void, do_ellipse, (struct BITMAP *bmp, int x, int y, int rx, int ry, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, _soft_ellipse, (struct BITMAP *bmp, int x, int y, int rx, int ry, int color));
! AL_FUNC(void, _soft_ellipsefill, (struct BITMAP *bmp, int x, int y, int rx, int ry, int color));
  AL_FUNC(void, do_arc, (struct BITMAP *bmp, int x, int y, fixed ang1, fixed ang2, int r, int d, AL_METHOD(void, proc, (struct BITMAP *, int, int, int))));
! AL_FUNC(void, _soft_arc, (struct BITMAP *bmp, int x, int y, fixed ang1, fixed ang2, int r, int color));
  AL_FUNC(void, calc_spline, (AL_CONST int points[8], int npts, int *x, int *y));
! AL_FUNC(void, _soft_spline, (struct BITMAP *bmp, AL_CONST int points[8], int color));
! AL_FUNC(void, _soft_floodfill, (struct BITMAP *bmp, int x, int y, int color));
  AL_FUNC(void, blit, (struct BITMAP *source, struct BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, masked_blit, (struct BITMAP *source, struct BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 58,64 ****
  AL_FUNC(void, masked_stretch_blit, (struct BITMAP *s, struct BITMAP *d, int s_x, int s_y, int s_w, int s_h, int d_x, int d_y, int d_w, int d_h));
  AL_FUNC(void, stretch_sprite, (struct BITMAP *bmp, struct BITMAP *sprite, int x, int y, int w, int h));
! AL_FUNC(void, draw_gouraud_sprite, (struct BITMAP *bmp, struct BITMAP *sprite, int x, int y, int c1, int c2, int c3, int c4));
! 
! #include "inline/draw.inl"
  
  #ifdef __cplusplus
--- 58,62 ----
  AL_FUNC(void, masked_stretch_blit, (struct BITMAP *s, struct BITMAP *d, int s_x, int s_y, int s_w, int s_h, int d_x, int d_y, int d_w, int d_h));
  AL_FUNC(void, stretch_sprite, (struct BITMAP *bmp, struct BITMAP *sprite, int x, int y, int w, int h));
! AL_FUNC(void, _soft_draw_gouraud_sprite, (struct BITMAP *bmp, struct BITMAP *sprite, int x, int y, int c1, int c2, int c3, int c4));
  
  #ifdef __cplusplus
***************
*** 66,69 ****
--- 64,69 ----
  #endif
  
+ #include "inline/draw.inl"
+ 
  #endif          /* ifndef ALLEGRO_DRAW_H */
  

Index: timer.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/timer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** timer.h	8 Jun 2003 19:24:56 -0000	1.3
--- timer.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_TIMER_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  #define TIMERS_PER_SECOND     1193181L
  #define SECS_TO_TIMER(x)      ((long)(x) * TIMERS_PER_SECOND)
--- 20,29 ----
  #define ALLEGRO_TIMER_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  #define TIMERS_PER_SECOND     1193181L
  #define SECS_TO_TIMER(x)      ((long)(x) * TIMERS_PER_SECOND)
***************
*** 32,36 ****
  #define BPM_TO_TIMER(x)       ((60 * TIMERS_PER_SECOND) / (long)(x))
  
- 
  typedef struct TIMER_DRIVER
  {
--- 32,35 ----
***************
*** 47,51 ****
     AL_METHOD(int,  can_simulate_retrace, (void));
     AL_METHOD(void, simulate_retrace, (int enable));
!    AL_METHOD(void, rest, (long time, AL_METHOD(void, callback, (void))));
  } TIMER_DRIVER;
  
--- 46,50 ----
     AL_METHOD(int,  can_simulate_retrace, (void));
     AL_METHOD(void, simulate_retrace, (int enable));
!    AL_METHOD(void, rest, (unsigned int tyme, AL_METHOD(void, callback, (void))));
  } TIMER_DRIVER;
  
***************
*** 66,77 ****
  
  AL_VAR(volatile int, retrace_count);
- AL_FUNCPTR(void, retrace_proc, (void));
  
! AL_FUNC(int,  timer_can_simulate_retrace, (void));
! AL_FUNC(void, timer_simulate_retrace, (int enable));
! AL_FUNC(int,  timer_is_using_retrace, (void));
! 
! AL_FUNC(void, rest, (long time));
! AL_FUNC(void, rest_callback, (long time, AL_METHOD(void, callback, (void))));
  
  #ifdef __cplusplus
--- 65,71 ----
  
  AL_VAR(volatile int, retrace_count);
  
! AL_FUNC(void, rest, (unsigned int tyme));
! AL_FUNC(void, rest_callback, (unsigned int tyme, AL_METHOD(void, callback, (void))));
  
  #ifdef __cplusplus

Index: compiled.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/compiled.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compiled.h	8 Jun 2003 19:24:56 -0000	1.3
--- compiled.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_COMPILED_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  struct BITMAP;
  
--- 20,29 ----
  #define ALLEGRO_COMPILED_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  struct BITMAP;
  

Index: file.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/file.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** file.h	8 Jun 2003 19:24:56 -0000	1.3
--- file.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 9,13 ****
   *                                           \_/__/
   *
!  *      File I/O and compression routines.
   *
   *      By Shawn Hargreaves.
--- 9,13 ----
   *                                           \_/__/
   *
!  *      File I/O.
   *
   *      By Shawn Hargreaves.
***************
*** 20,32 ****
  #define ALLEGRO_FILE_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  AL_FUNC(char *, fix_filename_case, (char *path));
  AL_FUNC(char *, fix_filename_slashes, (char *path));
! AL_FUNC(char *, fix_filename_path, (char *dest, AL_CONST char *path, int size));
  AL_FUNC(char *, replace_filename, (char *dest, AL_CONST char *path, AL_CONST char *filename, int size));
  AL_FUNC(char *, replace_extension, (char *dest, AL_CONST char *filename, AL_CONST char *ext, int size));
--- 20,35 ----
  #define ALLEGRO_FILE_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  AL_FUNC(char *, fix_filename_case, (char *path));
  AL_FUNC(char *, fix_filename_slashes, (char *path));
! AL_FUNC(char *, canonicalize_filename, (char *dest, AL_CONST char *filename, int size));
! AL_FUNC(char *, make_absolute_filename, (char *dest, AL_CONST char *path, AL_CONST char *filename, int size));
! AL_FUNC(char *, make_relative_filename, (char *dest, AL_CONST char *path, AL_CONST char *filename, int size));
! AL_FUNC(int, is_relative_filename, (AL_CONST char *filename));
  AL_FUNC(char *, replace_filename, (char *dest, AL_CONST char *path, AL_CONST char *filename, int size));
  AL_FUNC(char *, replace_extension, (char *dest, AL_CONST char *filename, AL_CONST char *ext, int size));
***************
*** 40,44 ****
  AL_FUNC(time_t, file_time, (AL_CONST char *filename));
  AL_FUNC(int, delete_file, (AL_CONST char *filename));
! AL_FUNC(int, for_each_file, (AL_CONST char *name, int attrib, AL_METHOD(void, callback, (AL_CONST char *filename, int attrib, int param)), int param));
  AL_FUNC(int, find_allegro_resource, (char *dest, AL_CONST char *resource, AL_CONST char *ext, AL_CONST char *datafile, AL_CONST char *objectname, AL_CONST char *envvar, AL_CONST char *subdir, int size));
  
--- 43,48 ----
  AL_FUNC(time_t, file_time, (AL_CONST char *filename));
  AL_FUNC(int, delete_file, (AL_CONST char *filename));
! AL_FUNC(int, for_each_file_ex, (AL_CONST char *name, int in_attrib, int out_attrib, AL_METHOD(int, callback, (AL_CONST char *filename, int attrib, void *param)), void *param));
! AL_FUNC(int, set_allegro_resource_path, (int priority, AL_CONST char *path));
  AL_FUNC(int, find_allegro_resource, (char *dest, AL_CONST char *resource, AL_CONST char *ext, AL_CONST char *datafile, AL_CONST char *objectname, AL_CONST char *envvar, AL_CONST char *subdir, int size));
  
***************
*** 80,84 ****
  
  
! typedef struct PACKFILE                /* our very own FILE structure... */
  {
     int hndl;                           /* DOS file handle */
--- 84,95 ----
  
  
! typedef struct PACKFILE_VTABLE PACKFILE_VTABLE;
! typedef struct PACKFILE PACKFILE;
! 
! struct LZSS_PACK_DATA;
! struct LZSS_UNPACK_DATA;
! 
! 
! struct _al_normal_packfile_details
  {
     int hndl;                           /* DOS file handle */
***************
*** 88,105 ****
     long todo;                          /* number of bytes still on the disk */
     struct PACKFILE *parent;            /* nested, parent file */
!    void *pack_data;                    /* for LZSS compression */
     char *filename;                     /* name of the file */
     char *passdata;                     /* encryption key data */
     char *passpos;                      /* current key position */
     unsigned char buf[F_BUF_SIZE];      /* the actual data buffer */
! } PACKFILE;
  
  
  AL_FUNC(void, packfile_password, (AL_CONST char *password));
  AL_FUNC(PACKFILE *, pack_fopen, (AL_CONST char *filename, AL_CONST char *mode));
  AL_FUNC(int, pack_fclose, (PACKFILE *f));
  AL_FUNC(int, pack_fseek, (PACKFILE *f, int offset));
  AL_FUNC(PACKFILE *, pack_fopen_chunk, (PACKFILE *f, int pack));
  AL_FUNC(PACKFILE *, pack_fclose_chunk, (PACKFILE *f));
  AL_FUNC(int, pack_igetw, (PACKFILE *f));
  AL_FUNC(long, pack_igetl, (PACKFILE *f));
--- 99,151 ----
     long todo;                          /* number of bytes still on the disk */
     struct PACKFILE *parent;            /* nested, parent file */
!    struct LZSS_PACK_DATA *pack_data;   /* for LZSS compression */
!    struct LZSS_UNPACK_DATA *unpack_data; /* for LZSS decompression */
     char *filename;                     /* name of the file */
     char *passdata;                     /* encryption key data */
     char *passpos;                      /* current key position */
     unsigned char buf[F_BUF_SIZE];      /* the actual data buffer */
! };
! 
! 
! struct PACKFILE                           /* our very own FILE structure... */
! {
!    AL_CONST PACKFILE_VTABLE *vtable;
!    void *userdata;
!    int is_normal_packfile;
! 
!    /* The following is only to be used for the "normal" PACKFILE vtable,
!     * i.e. what is implemented by Allegro itself. If is_normal_packfile is
!     * false then the following is not even allocated. This must be the last
!     * member in the structure.
!     */
!    struct _al_normal_packfile_details normal;
! };
! 
! 
! struct PACKFILE_VTABLE
! {
!    AL_METHOD(int, pf_fclose, (void *userdata));
!    AL_METHOD(int, pf_getc, (void *userdata));
!    AL_METHOD(int, pf_ungetc, (int c, void *userdata));
!    AL_METHOD(long, pf_fread, (void *p, long n, void *userdata));
!    AL_METHOD(int, pf_putc, (int c, void *userdata));
!    AL_METHOD(long, pf_fwrite, (AL_CONST void *p, long n, void *userdata));
!    AL_METHOD(int, pf_fseek, (void *userdata, int offset));
!    AL_METHOD(int, pf_feof, (void *userdata));
!    AL_METHOD(int, pf_ferror, (void *userdata));
! };
  
  
  AL_FUNC(void, packfile_password, (AL_CONST char *password));
  AL_FUNC(PACKFILE *, pack_fopen, (AL_CONST char *filename, AL_CONST char *mode));
+ AL_FUNC(PACKFILE *, pack_fopen_vtable, (AL_CONST PACKFILE_VTABLE *vtable, void *userdata));
  AL_FUNC(int, pack_fclose, (PACKFILE *f));
  AL_FUNC(int, pack_fseek, (PACKFILE *f, int offset));
  AL_FUNC(PACKFILE *, pack_fopen_chunk, (PACKFILE *f, int pack));
  AL_FUNC(PACKFILE *, pack_fclose_chunk, (PACKFILE *f));
+ AL_FUNC(int, pack_getc, (PACKFILE *f));
+ AL_FUNC(int, pack_putc, (int c, PACKFILE *f));
+ AL_FUNC(int, pack_feof, (PACKFILE *f));
+ AL_FUNC(int, pack_ferror, (PACKFILE *f));
  AL_FUNC(int, pack_igetw, (PACKFILE *f));
  AL_FUNC(long, pack_igetl, (PACKFILE *f));
***************
*** 112,122 ****
  AL_FUNC(long, pack_fread, (void *p, long n, PACKFILE *f));
  AL_FUNC(long, pack_fwrite, (AL_CONST void *p, long n, PACKFILE *f));
  AL_FUNC(char *, pack_fgets, (char *p, int max, PACKFILE *f));
  AL_FUNC(int, pack_fputs, (AL_CONST char *p, PACKFILE *f));
  
- AL_FUNC(int, _sort_out_getc, (PACKFILE *f));
- AL_FUNC(int, _sort_out_putc, (int c, PACKFILE *f));
- 
- #include "inline/file.inl"
  
  #ifdef __cplusplus
--- 158,166 ----
  AL_FUNC(long, pack_fread, (void *p, long n, PACKFILE *f));
  AL_FUNC(long, pack_fwrite, (AL_CONST void *p, long n, PACKFILE *f));
+ AL_FUNC(int, pack_ungetc, (int c, PACKFILE *f));
  AL_FUNC(char *, pack_fgets, (char *p, int max, PACKFILE *f));
  AL_FUNC(int, pack_fputs, (AL_CONST char *p, PACKFILE *f));
+ AL_FUNC(void *, pack_get_userdata, (PACKFILE *f));
  
  
  #ifdef __cplusplus

Index: 3d.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/3d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 3d.h	8 Jun 2003 19:24:56 -0000	1.3
--- 3d.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,30 ****
  #define ALLEGRO_3D_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- #include "fixed.h"
- 
  struct BITMAP;
  
--- 20,30 ----
  #define ALLEGRO_3D_H
  
+ #include "base.h"
+ #include "fixed.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  struct BITMAP;
  
***************
*** 65,74 ****
  AL_VAR(float, scene_gap);
  
! AL_FUNC(void, polygon3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, int vc, V3D *vtx[]));
! AL_FUNC(void, polygon3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, int vc, V3D_f *vtx[]));
! AL_FUNC(void, triangle3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D *v1, V3D *v2, V3D *v3));
! AL_FUNC(void, triangle3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3));
! AL_FUNC(void, quad3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D *v1, V3D *v2, V3D *v3, V3D *v4));
! AL_FUNC(void, quad3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3, V3D_f *v4));
  AL_FUNC(int, clip3d, (int type, fixed min_z, fixed max_z, int vc, AL_CONST V3D *vtx[], V3D *vout[], V3D *vtmp[], int out[]));
  AL_FUNC(int, clip3d_f, (int type, float min_z, float max_z, int vc, AL_CONST V3D_f *vtx[], V3D_f *vout[], V3D_f *vtmp[], int out[]));
--- 65,74 ----
  AL_VAR(float, scene_gap);
  
! AL_FUNC(void, _soft_polygon3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, int vc, V3D *vtx[]));
! AL_FUNC(void, _soft_polygon3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, int vc, V3D_f *vtx[]));
! AL_FUNC(void, _soft_triangle3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D *v1, V3D *v2, V3D *v3));
! AL_FUNC(void, _soft_triangle3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3));
! AL_FUNC(void, _soft_quad3d, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D *v1, V3D *v2, V3D *v3, V3D *v4));
! AL_FUNC(void, _soft_quad3d_f, (struct BITMAP *bmp, int type, struct BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3, V3D_f *v4));
  AL_FUNC(int, clip3d, (int type, fixed min_z, fixed max_z, int vc, AL_CONST V3D *vtx[], V3D *vout[], V3D *vtmp[], int out[]));
  AL_FUNC(int, clip3d_f, (int type, float min_z, float max_z, int vc, AL_CONST V3D_f *vtx[], V3D_f *vout[], V3D_f *vtmp[], int out[]));

Index: matrix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/matrix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** matrix.h	8 Jun 2003 19:24:56 -0000	1.3
--- matrix.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,31 ****
  #define ALLEGRO_MATRIX_H
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #include "base.h"
  #include "fixed.h"
  #include "fmaths.h"
  
  typedef struct MATRIX            /* transformation matrix (fixed point) */
  {
--- 20,31 ----
  #define ALLEGRO_MATRIX_H
  
  #include "base.h"
  #include "fixed.h"
  #include "fmaths.h"
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  typedef struct MATRIX            /* transformation matrix (fixed point) */
  {
***************
*** 86,95 ****
  AL_FUNC(void, apply_matrix_f, (AL_CONST MATRIX_f *m, float x, float y, float z, float *xout, float *yout, float *zout));
  
- #include "inline/matrix.inl"
- 
  #ifdef __cplusplus
     }
  #endif
  
  #endif          /* ifndef ALLEGRO_MATRIX_H */
  
--- 86,95 ----
  AL_FUNC(void, apply_matrix_f, (AL_CONST MATRIX_f *m, float x, float y, float z, float *xout, float *yout, float *zout));
  
  #ifdef __cplusplus
     }
  #endif
  
+ #include "inline/matrix.inl"
+ 
  #endif          /* ifndef ALLEGRO_MATRIX_H */
  

Index: unicode.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/unicode.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** unicode.h	8 Jun 2003 19:24:56 -0000	1.3
--- unicode.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_UNICODE__H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  #define U_ASCII         AL_ID('A','S','C','8')
  #define U_ASCII_CP      AL_ID('A','S','C','P')
--- 20,29 ----
  #define ALLEGRO_UNICODE__H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  #define U_ASCII         AL_ID('A','S','C','8')
  #define U_ASCII_CP      AL_ID('A','S','C','P')
***************
*** 57,65 ****
  AL_FUNCPTR(int, ucwidth, (int c));
  AL_FUNCPTR(int, uisok, (int c));
! AL_FUNC(int, uoffset, (AL_CONST char *s, int index));
! AL_FUNC(int, ugetat, (AL_CONST char *s, int index));
! AL_FUNC(int, usetat, (char *s, int index, int c));
! AL_FUNC(int, uinsert, (char *s, int index, int c));
! AL_FUNC(int, uremove, (char *s, int index));
  AL_FUNC(int, utolower, (int c));
  AL_FUNC(int, utoupper, (int c));
--- 57,65 ----
  AL_FUNCPTR(int, ucwidth, (int c));
  AL_FUNCPTR(int, uisok, (int c));
! AL_FUNC(int, uoffset, (AL_CONST char *s, int idx));
! AL_FUNC(int, ugetat, (AL_CONST char *s, int idx));
! AL_FUNC(int, usetat, (char *s, int idx, int c));
! AL_FUNC(int, uinsert, (char *s, int idx, int c));
! AL_FUNC(int, uremove, (char *s, int idx));
  AL_FUNC(int, utolower, (int c));
  AL_FUNC(int, utoupper, (int c));
***************
*** 77,80 ****
--- 77,81 ----
  AL_FUNC(int, ustrncmp, (AL_CONST char *s1, AL_CONST char *s2, int n));
  AL_FUNC(int, ustricmp, (AL_CONST char *s1, AL_CONST char *s2));
+ AL_FUNC(int, ustrnicmp, (AL_CONST char *s1, AL_CONST char *s2, int n));
  AL_FUNC(char *, ustrlwr, (char *s));
  AL_FUNC(char *, ustrupr, (char *s));
***************
*** 94,98 ****
  
  #ifndef ustrdup
!    #define ustrdup(src)               _ustrdup(src, malloc)
  #endif
  
--- 95,103 ----
  
  #ifndef ustrdup
!    #ifdef FORTIFY
!       #define ustrdup(src)            _ustrdup(src, Fortify_malloc)
!    #else
!       #define ustrdup(src)            _ustrdup(src, malloc)
!    #endif
  #endif
  

Index: keyboard.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/keyboard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** keyboard.h	8 Jun 2003 19:24:56 -0000	1.3
--- keyboard.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_KEYBOARD_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  typedef struct KEYBOARD_DRIVER
  {
--- 20,29 ----
  #define ALLEGRO_KEYBOARD_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  typedef struct KEYBOARD_DRIVER
  {
***************
*** 41,44 ****
--- 41,45 ----
     AL_METHOD(void, stop_waiting_for_input, (void));
     AL_METHOD(int,  scancode_to_ascii, (int scancode));
+    AL_METHOD(AL_CONST char *, scancode_to_name, (int scancode));
  } KEYBOARD_DRIVER;
  
***************
*** 74,214 ****
  AL_FUNC(void, set_keyboard_rate, (int delay, int repeat));
  AL_FUNC(int, scancode_to_ascii, (int scancode));
  
  #ifndef ALLEGRO_NO_KEY_DEFINES
  
! #define KB_SHIFT_FLAG         0x0001
! #define KB_CTRL_FLAG          0x0002
! #define KB_ALT_FLAG           0x0004
! #define KB_LWIN_FLAG          0x0008
! #define KB_RWIN_FLAG          0x0010
! #define KB_MENU_FLAG          0x0020
! #define KB_SCROLOCK_FLAG      0x0100
! #define KB_NUMLOCK_FLAG       0x0200
! #define KB_CAPSLOCK_FLAG      0x0400
! #define KB_INALTSEQ_FLAG      0x0800
! #define KB_ACCENT1_FLAG       0x1000
! #define KB_ACCENT2_FLAG       0x2000
! #define KB_ACCENT3_FLAG       0x4000
! #define KB_ACCENT4_FLAG       0x8000
  
! #define KEY_A                 1
! #define KEY_B                 2
! #define KEY_C                 3
! #define KEY_D                 4
! #define KEY_E                 5
! #define KEY_F                 6
! #define KEY_G                 7
! #define KEY_H                 8
! #define KEY_I                 9
! #define KEY_J                 10
! #define KEY_K                 11
! #define KEY_L                 12
! #define KEY_M                 13
! #define KEY_N                 14
! #define KEY_O                 15
! #define KEY_P                 16
! #define KEY_Q                 17
! #define KEY_R                 18
! #define KEY_S                 19
! #define KEY_T                 20
! #define KEY_U                 21
! #define KEY_V                 22
! #define KEY_W                 23
! #define KEY_X                 24
! #define KEY_Y                 25
! #define KEY_Z                 26
! #define KEY_0                 27
! #define KEY_1                 28
! #define KEY_2                 29
! #define KEY_3                 30
! #define KEY_4                 31
! #define KEY_5                 32
! #define KEY_6                 33
! #define KEY_7                 34
! #define KEY_8                 35
! #define KEY_9                 36
! #define KEY_0_PAD             37
! #define KEY_1_PAD             38
! #define KEY_2_PAD             39
! #define KEY_3_PAD             40
! #define KEY_4_PAD             41
! #define KEY_5_PAD             42
! #define KEY_6_PAD             43
! #define KEY_7_PAD             44
! #define KEY_8_PAD             45
! #define KEY_9_PAD             46
! #define KEY_F1                47
! #define KEY_F2                48
! #define KEY_F3                49
! #define KEY_F4                50
! #define KEY_F5                51
! #define KEY_F6                52
! #define KEY_F7                53
! #define KEY_F8                54
! #define KEY_F9                55
! #define KEY_F10               56
! #define KEY_F11               57
! #define KEY_F12               58
! #define KEY_ESC               59
! #define KEY_TILDE             60
! #define KEY_MINUS             61
! #define KEY_EQUALS            62
! #define KEY_BACKSPACE         63
! #define KEY_TAB               64
! #define KEY_OPENBRACE         65
! #define KEY_CLOSEBRACE        66
! #define KEY_ENTER             67
! #define KEY_COLON             68
! #define KEY_QUOTE             69
! #define KEY_BACKSLASH         70
! #define KEY_BACKSLASH2        71
! #define KEY_COMMA             72
! #define KEY_STOP              73
! #define KEY_SLASH             74
! #define KEY_SPACE             75
! #define KEY_INSERT            76
! #define KEY_DEL               77
! #define KEY_HOME              78
! #define KEY_END               79
! #define KEY_PGUP              80
! #define KEY_PGDN              81
! #define KEY_LEFT              82
! #define KEY_RIGHT             83
! #define KEY_UP                84
! #define KEY_DOWN              85
! #define KEY_SLASH_PAD         86
! #define KEY_ASTERISK          87
! #define KEY_MINUS_PAD         88
! #define KEY_PLUS_PAD          89
! #define KEY_DEL_PAD           90
! #define KEY_ENTER_PAD         91
! #define KEY_PRTSCR            92
! #define KEY_PAUSE             93
! #define KEY_ABNT_C1           94
! #define KEY_YEN               95
! #define KEY_KANA              96
! #define KEY_CONVERT           97
! #define KEY_NOCONVERT         98
! #define KEY_AT                99
! #define KEY_CIRCUMFLEX        100
! #define KEY_COLON2            101
! #define KEY_KANJI             102
  
! #define KEY_MODIFIERS         103
  
! #define KEY_LSHIFT            103
! #define KEY_RSHIFT            104
! #define KEY_LCONTROL          105
! #define KEY_RCONTROL          106
! #define KEY_ALT               107
! #define KEY_ALTGR             108
! #define KEY_LWIN              109
! #define KEY_RWIN              110
! #define KEY_MENU              111
! #define KEY_SCRLOCK           112
! #define KEY_NUMLOCK           113
! #define KEY_CAPSLOCK          114
  
! #define KEY_MAX               115
  
  #endif /* ALLEGRO_NO_KEY_DEFINES */
--- 75,387 ----
  AL_FUNC(void, set_keyboard_rate, (int delay, int repeat));
  AL_FUNC(int, scancode_to_ascii, (int scancode));
+ AL_FUNC(AL_CONST char *, scancode_to_name, (int scancode));
+ 
+ /* The KEY_ macros are no longer #defined directly to avoid conflicting with
+  * linux (which has its own KEY_ constants).  "__allegro_"-prefixed constants
+  * are used by the Allegro-Linux keyboard driver, but everyone else should
+  * continue to use the KEY_ constants.
+  */
+ 
+ enum {
+    __allegro_KB_SHIFT_FLAG    = 0x0001,
+    __allegro_KB_CTRL_FLAG     = 0x0002,
+    __allegro_KB_ALT_FLAG      = 0x0004,
+    __allegro_KB_LWIN_FLAG     = 0x0008,
+    __allegro_KB_RWIN_FLAG     = 0x0010,
+    __allegro_KB_MENU_FLAG     = 0x0020,
+    __allegro_KB_COMMAND_FLAG  = 0x0040,
+    __allegro_KB_SCROLOCK_FLAG = 0x0100,
+    __allegro_KB_NUMLOCK_FLAG  = 0x0200,
+    __allegro_KB_CAPSLOCK_FLAG = 0x0400,
+    __allegro_KB_INALTSEQ_FLAG = 0x0800,
+    __allegro_KB_ACCENT1_FLAG  = 0x1000,
+    __allegro_KB_ACCENT2_FLAG  = 0x2000,
+    __allegro_KB_ACCENT3_FLAG  = 0x4000,
+    __allegro_KB_ACCENT4_FLAG  = 0x8000
+ };
+ 
+ enum {
+    __allegro_KEY_A            = 1,
+    __allegro_KEY_B            = 2,
+    __allegro_KEY_C            = 3,
+    __allegro_KEY_D            = 4,
+    __allegro_KEY_E            = 5,
+    __allegro_KEY_F            = 6,
+    __allegro_KEY_G            = 7,
+    __allegro_KEY_H            = 8,
+    __allegro_KEY_I            = 9,
+    __allegro_KEY_J            = 10,
+    __allegro_KEY_K            = 11,
+    __allegro_KEY_L            = 12,
+    __allegro_KEY_M            = 13,
+    __allegro_KEY_N            = 14,
+    __allegro_KEY_O            = 15,
+    __allegro_KEY_P            = 16,
+    __allegro_KEY_Q            = 17,
+    __allegro_KEY_R            = 18,
+    __allegro_KEY_S            = 19,
+    __allegro_KEY_T            = 20,
+    __allegro_KEY_U            = 21,
+    __allegro_KEY_V            = 22,
+    __allegro_KEY_W            = 23,
+    __allegro_KEY_X            = 24,
+    __allegro_KEY_Y            = 25,
+    __allegro_KEY_Z            = 26,
+    __allegro_KEY_0            = 27,
+    __allegro_KEY_1            = 28,
+    __allegro_KEY_2            = 29,
+    __allegro_KEY_3            = 30,
+    __allegro_KEY_4            = 31,
+    __allegro_KEY_5            = 32,
+    __allegro_KEY_6            = 33,
+    __allegro_KEY_7            = 34,
+    __allegro_KEY_8            = 35,
+    __allegro_KEY_9            = 36,
+    __allegro_KEY_0_PAD        = 37,
+    __allegro_KEY_1_PAD        = 38,
+    __allegro_KEY_2_PAD        = 39,
+    __allegro_KEY_3_PAD        = 40,
+    __allegro_KEY_4_PAD        = 41,
+    __allegro_KEY_5_PAD        = 42,
+    __allegro_KEY_6_PAD        = 43,
+    __allegro_KEY_7_PAD        = 44,
+    __allegro_KEY_8_PAD        = 45,
+    __allegro_KEY_9_PAD        = 46,
+    __allegro_KEY_F1           = 47,
+    __allegro_KEY_F2           = 48,
+    __allegro_KEY_F3           = 49,
+    __allegro_KEY_F4           = 50,
+    __allegro_KEY_F5           = 51,
+    __allegro_KEY_F6           = 52,
+    __allegro_KEY_F7           = 53,
+    __allegro_KEY_F8           = 54,
+    __allegro_KEY_F9           = 55,
+    __allegro_KEY_F10          = 56,
+    __allegro_KEY_F11          = 57,
+    __allegro_KEY_F12          = 58,
+    __allegro_KEY_ESC          = 59,
+    __allegro_KEY_TILDE        = 60,
+    __allegro_KEY_MINUS        = 61,
+    __allegro_KEY_EQUALS       = 62,
+    __allegro_KEY_BACKSPACE    = 63,
+    __allegro_KEY_TAB          = 64,
+    __allegro_KEY_OPENBRACE    = 65,
+    __allegro_KEY_CLOSEBRACE   = 66,
+    __allegro_KEY_ENTER        = 67,
+    __allegro_KEY_COLON        = 68,
+    __allegro_KEY_QUOTE        = 69,
+    __allegro_KEY_BACKSLASH    = 70,
+    __allegro_KEY_BACKSLASH2   = 71,
+    __allegro_KEY_COMMA        = 72,
+    __allegro_KEY_STOP         = 73,
+    __allegro_KEY_SLASH        = 74,
+    __allegro_KEY_SPACE        = 75,
+    __allegro_KEY_INSERT       = 76,
+    __allegro_KEY_DEL          = 77,
+    __allegro_KEY_HOME         = 78,
+    __allegro_KEY_END          = 79,
+    __allegro_KEY_PGUP         = 80,
+    __allegro_KEY_PGDN         = 81,
+    __allegro_KEY_LEFT         = 82,
+    __allegro_KEY_RIGHT        = 83,
+    __allegro_KEY_UP           = 84,
+    __allegro_KEY_DOWN         = 85,
+    __allegro_KEY_SLASH_PAD    = 86,
+    __allegro_KEY_ASTERISK     = 87,
+    __allegro_KEY_MINUS_PAD    = 88,
+    __allegro_KEY_PLUS_PAD     = 89,
+    __allegro_KEY_DEL_PAD      = 90,
+    __allegro_KEY_ENTER_PAD    = 91,
+    __allegro_KEY_PRTSCR       = 92,
+    __allegro_KEY_PAUSE        = 93,
+    __allegro_KEY_ABNT_C1      = 94,
+    __allegro_KEY_YEN          = 95,
+    __allegro_KEY_KANA         = 96,
+    __allegro_KEY_CONVERT      = 97,
+    __allegro_KEY_NOCONVERT    = 98,
+    __allegro_KEY_AT           = 99,
+    __allegro_KEY_CIRCUMFLEX   = 100,
+    __allegro_KEY_COLON2       = 101,
+    __allegro_KEY_KANJI        = 102,
+    __allegro_KEY_EQUALS_PAD   = 103,  /* MacOS X */
+    __allegro_KEY_BACKQUOTE    = 104,  /* MacOS X */
+    __allegro_KEY_SEMICOLON    = 105,  /* MacOS X */
+    __allegro_KEY_COMMAND      = 106,  /* MacOS X */
+    __allegro_KEY_UNKNOWN1     = 107,
+    __allegro_KEY_UNKNOWN2     = 108,
+    __allegro_KEY_UNKNOWN3     = 109,
+    __allegro_KEY_UNKNOWN4     = 110,
+    __allegro_KEY_UNKNOWN5     = 111,
+    __allegro_KEY_UNKNOWN6     = 112,
+    __allegro_KEY_UNKNOWN7     = 113,
+    __allegro_KEY_UNKNOWN8     = 114,
+ 
+    __allegro_KEY_MODIFIERS    = 115,
+ 
+    __allegro_KEY_LSHIFT       = 115,
+    __allegro_KEY_RSHIFT       = 116,
+    __allegro_KEY_LCONTROL     = 117,
+    __allegro_KEY_RCONTROL     = 118,
+    __allegro_KEY_ALT          = 119,
+    __allegro_KEY_ALTGR        = 120,
+    __allegro_KEY_LWIN         = 121,
+    __allegro_KEY_RWIN         = 122,
+    __allegro_KEY_MENU         = 123,
+    __allegro_KEY_SCRLOCK      = 124,
+    __allegro_KEY_NUMLOCK      = 125,
+    __allegro_KEY_CAPSLOCK     = 126,
+ 
+    __allegro_KEY_MAX          = 127
+ };
  
  #ifndef ALLEGRO_NO_KEY_DEFINES
  
! #define KB_SHIFT_FLAG         __allegro_KB_SHIFT_FLAG
! #define KB_CTRL_FLAG          __allegro_KB_CTRL_FLAG
! #define KB_ALT_FLAG           __allegro_KB_ALT_FLAG
! #define KB_LWIN_FLAG          __allegro_KB_LWIN_FLAG
! #define KB_RWIN_FLAG          __allegro_KB_RWIN_FLAG
! #define KB_MENU_FLAG          __allegro_KB_MENU_FLAG
! #define KB_COMMAND_FLAG       __allegro_KB_COMMAND_FLAG
! #define KB_SCROLOCK_FLAG      __allegro_KB_SCROLOCK_FLAG
! #define KB_NUMLOCK_FLAG       __allegro_KB_NUMLOCK_FLAG
! #define KB_CAPSLOCK_FLAG      __allegro_KB_CAPSLOCK_FLAG
! #define KB_INALTSEQ_FLAG      __allegro_KB_INALTSEQ_FLAG
! #define KB_ACCENT1_FLAG       __allegro_KB_ACCENT1_FLAG
! #define KB_ACCENT2_FLAG       __allegro_KB_ACCENT2_FLAG
! #define KB_ACCENT3_FLAG       __allegro_KB_ACCENT3_FLAG
! #define KB_ACCENT4_FLAG       __allegro_KB_ACCENT4_FLAG
  
! #define KEY_A                 __allegro_KEY_A
! #define KEY_B                 __allegro_KEY_B
! #define KEY_C                 __allegro_KEY_C
! #define KEY_D                 __allegro_KEY_D
! #define KEY_E                 __allegro_KEY_E
! #define KEY_F                 __allegro_KEY_F
! #define KEY_G                 __allegro_KEY_G
! #define KEY_H                 __allegro_KEY_H
! #define KEY_I                 __allegro_KEY_I
! #define KEY_J                 __allegro_KEY_J
! #define KEY_K                 __allegro_KEY_K
! #define KEY_L                 __allegro_KEY_L
! #define KEY_M                 __allegro_KEY_M
! #define KEY_N                 __allegro_KEY_N
! #define KEY_O                 __allegro_KEY_O
! #define KEY_P                 __allegro_KEY_P
! #define KEY_Q                 __allegro_KEY_Q
! #define KEY_R                 __allegro_KEY_R
! #define KEY_S                 __allegro_KEY_S
! #define KEY_T                 __allegro_KEY_T
! #define KEY_U                 __allegro_KEY_U
! #define KEY_V                 __allegro_KEY_V
! #define KEY_W                 __allegro_KEY_W
! #define KEY_X                 __allegro_KEY_X
! #define KEY_Y                 __allegro_KEY_Y
! #define KEY_Z                 __allegro_KEY_Z
! #define KEY_0                 __allegro_KEY_0
! #define KEY_1                 __allegro_KEY_1
! #define KEY_2                 __allegro_KEY_2
! #define KEY_3                 __allegro_KEY_3
! #define KEY_4                 __allegro_KEY_4
! #define KEY_5                 __allegro_KEY_5
! #define KEY_6                 __allegro_KEY_6
! #define KEY_7                 __allegro_KEY_7
! #define KEY_8                 __allegro_KEY_8
! #define KEY_9                 __allegro_KEY_9
! #define KEY_0_PAD             __allegro_KEY_0_PAD
! #define KEY_1_PAD             __allegro_KEY_1_PAD
! #define KEY_2_PAD             __allegro_KEY_2_PAD
! #define KEY_3_PAD             __allegro_KEY_3_PAD
! #define KEY_4_PAD             __allegro_KEY_4_PAD
! #define KEY_5_PAD             __allegro_KEY_5_PAD
! #define KEY_6_PAD             __allegro_KEY_6_PAD
! #define KEY_7_PAD             __allegro_KEY_7_PAD
! #define KEY_8_PAD             __allegro_KEY_8_PAD
! #define KEY_9_PAD             __allegro_KEY_9_PAD
! #define KEY_F1                __allegro_KEY_F1
! #define KEY_F2                __allegro_KEY_F2
! #define KEY_F3                __allegro_KEY_F3
! #define KEY_F4                __allegro_KEY_F4
! #define KEY_F5                __allegro_KEY_F5
! #define KEY_F6                __allegro_KEY_F6
! #define KEY_F7                __allegro_KEY_F7
! #define KEY_F8                __allegro_KEY_F8
! #define KEY_F9                __allegro_KEY_F9
! #define KEY_F10               __allegro_KEY_F10
! #define KEY_F11               __allegro_KEY_F11
! #define KEY_F12               __allegro_KEY_F12
! #define KEY_ESC               __allegro_KEY_ESC
! #define KEY_TILDE             __allegro_KEY_TILDE
! #define KEY_MINUS             __allegro_KEY_MINUS
! #define KEY_EQUALS            __allegro_KEY_EQUALS
! #define KEY_BACKSPACE         __allegro_KEY_BACKSPACE
! #define KEY_TAB               __allegro_KEY_TAB
! #define KEY_OPENBRACE         __allegro_KEY_OPENBRACE
! #define KEY_CLOSEBRACE        __allegro_KEY_CLOSEBRACE
! #define KEY_ENTER             __allegro_KEY_ENTER
! #define KEY_COLON             __allegro_KEY_COLON
! #define KEY_QUOTE             __allegro_KEY_QUOTE
! #define KEY_BACKSLASH         __allegro_KEY_BACKSLASH
! #define KEY_BACKSLASH2        __allegro_KEY_BACKSLASH2
! #define KEY_COMMA             __allegro_KEY_COMMA
! #define KEY_STOP              __allegro_KEY_STOP
! #define KEY_SLASH             __allegro_KEY_SLASH
! #define KEY_SPACE             __allegro_KEY_SPACE
! #define KEY_INSERT            __allegro_KEY_INSERT
! #define KEY_DEL               __allegro_KEY_DEL
! #define KEY_HOME              __allegro_KEY_HOME
! #define KEY_END               __allegro_KEY_END
! #define KEY_PGUP              __allegro_KEY_PGUP
! #define KEY_PGDN              __allegro_KEY_PGDN
! #define KEY_LEFT              __allegro_KEY_LEFT
! #define KEY_RIGHT             __allegro_KEY_RIGHT
! #define KEY_UP                __allegro_KEY_UP
! #define KEY_DOWN              __allegro_KEY_DOWN
! #define KEY_SLASH_PAD         __allegro_KEY_SLASH_PAD
! #define KEY_ASTERISK          __allegro_KEY_ASTERISK
! #define KEY_MINUS_PAD         __allegro_KEY_MINUS_PAD
! #define KEY_PLUS_PAD          __allegro_KEY_PLUS_PAD
! #define KEY_DEL_PAD           __allegro_KEY_DEL_PAD
! #define KEY_ENTER_PAD         __allegro_KEY_ENTER_PAD
! #define KEY_PRTSCR            __allegro_KEY_PRTSCR
! #define KEY_PAUSE             __allegro_KEY_PAUSE
! #define KEY_ABNT_C1           __allegro_KEY_ABNT_C1
! #define KEY_YEN               __allegro_KEY_YEN
! #define KEY_KANA              __allegro_KEY_KANA
! #define KEY_CONVERT           __allegro_KEY_CONVERT
! #define KEY_NOCONVERT         __allegro_KEY_NOCONVERT
! #define KEY_AT                __allegro_KEY_AT
! #define KEY_CIRCUMFLEX        __allegro_KEY_CIRCUMFLEX
! #define KEY_COLON2            __allegro_KEY_COLON2
! #define KEY_KANJI             __allegro_KEY_KANJI
! #define KEY_EQUALS_PAD        __allegro_KEY_EQUALS_PAD
! #define KEY_BACKQUOTE         __allegro_KEY_BACKQUOTE
! #define KEY_SEMICOLON         __allegro_KEY_SEMICOLON
! #define KEY_COMMAND           __allegro_KEY_COMMAND
! #define KEY_UNKNOWN1          __allegro_KEY_UNKNOWN1
! #define KEY_UNKNOWN2          __allegro_KEY_UNKNOWN2
! #define KEY_UNKNOWN3          __allegro_KEY_UNKNOWN3
! #define KEY_UNKNOWN4          __allegro_KEY_UNKNOWN4
! #define KEY_UNKNOWN5          __allegro_KEY_UNKNOWN5
! #define KEY_UNKNOWN6          __allegro_KEY_UNKNOWN6
! #define KEY_UNKNOWN7          __allegro_KEY_UNKNOWN7
! #define KEY_UNKNOWN8          __allegro_KEY_UNKNOWN8
  
! #define KEY_MODIFIERS         __allegro_KEY_MODIFIERS
  
! #define KEY_LSHIFT            __allegro_KEY_LSHIFT
! #define KEY_RSHIFT            __allegro_KEY_RSHIFT
! #define KEY_LCONTROL          __allegro_KEY_LCONTROL
! #define KEY_RCONTROL          __allegro_KEY_RCONTROL
! #define KEY_ALT               __allegro_KEY_ALT
! #define KEY_ALTGR             __allegro_KEY_ALTGR
! #define KEY_LWIN              __allegro_KEY_LWIN
! #define KEY_RWIN              __allegro_KEY_RWIN
! #define KEY_MENU              __allegro_KEY_MENU
! #define KEY_SCRLOCK           __allegro_KEY_SCRLOCK
! #define KEY_NUMLOCK           __allegro_KEY_NUMLOCK
! #define KEY_CAPSLOCK          __allegro_KEY_CAPSLOCK
  
! #define KEY_MAX               __allegro_KEY_MAX
  
  #endif /* ALLEGRO_NO_KEY_DEFINES */

Index: quat.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/quat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** quat.h	8 Jun 2003 19:24:56 -0000	1.3
--- quat.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_QUAT_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  typedef struct QUAT
  {
--- 20,29 ----
  #define ALLEGRO_QUAT_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  typedef struct QUAT
  {

Index: mouse.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/mouse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mouse.h	8 Jun 2003 19:24:56 -0000	1.3
--- mouse.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_MOUSE_H
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "base.h"
- 
  #define MOUSEDRV_AUTODETECT  -1
  #define MOUSEDRV_NONE         0
--- 20,29 ----
  #define ALLEGRO_MOUSE_H
  
+ #include "base.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  #define MOUSEDRV_AUTODETECT  -1
  #define MOUSEDRV_NONE         0
***************
*** 41,48 ****
     AL_METHOD(void, timer_poll, (void));
     AL_METHOD(void, position, (int x, int y));
!    AL_METHOD(void, set_range, (int x1, int y1, int x2, int y2));
     AL_METHOD(void, set_speed, (int xspeed, int yspeed));
     AL_METHOD(void, get_mickeys, (int *mickeyx, int *mickeyy));
     AL_METHOD(int,  analyse_data, (AL_CONST char *buffer, int size));
  } MOUSE_DRIVER;
  
--- 41,50 ----
     AL_METHOD(void, timer_poll, (void));
     AL_METHOD(void, position, (int x, int y));
!    AL_METHOD(void, set_range, (int x1, int y_1, int x2, int y2));
     AL_METHOD(void, set_speed, (int xspeed, int yspeed));
     AL_METHOD(void, get_mickeys, (int *mickeyx, int *mickeyy));
     AL_METHOD(int,  analyse_data, (AL_CONST char *buffer, int size));
+    AL_METHOD(void, enable_hardware_cursor, (int mode));
+    AL_METHOD(int,  select_system_cursor, (int cursor));
  } MOUSE_DRIVER;
  
***************
*** 58,61 ****
--- 60,75 ----
  AL_FUNC(int, mouse_needs_poll, (void));
  
+ AL_FUNC(void, enable_hardware_cursor, (void));
+ AL_FUNC(void, disable_hardware_cursor, (void));
+ 
+ /* Mouse cursors */
+ #define MOUSE_CURSOR_NONE        0
+ #define MOUSE_CURSOR_ALLEGRO     1
+ #define MOUSE_CURSOR_ARROW       2
+ #define MOUSE_CURSOR_BUSY        3
+ #define MOUSE_CURSOR_QUESTION    4
+ #define MOUSE_CURSOR_EDIT        5
+ #define NUM_MOUSE_CURSORS        6
+ 
  AL_VAR(struct BITMAP *, mouse_sprite);
  AL_VAR(int, mouse_x_focus);
***************
*** 87,96 ****
  AL_FUNC(void, position_mouse, (int x, int y));
  AL_FUNC(void, position_mouse_z, (int z));
! AL_FUNC(void, set_mouse_range, (int x1, int y1, int x2, int y2));
  AL_FUNC(void, set_mouse_speed, (int xspeed, int yspeed));
! AL_FUNC(void, set_mouse_sprite, (struct BITMAP *sprite));
  AL_FUNC(void, set_mouse_sprite_focus, (int x, int y));
  AL_FUNC(void, get_mouse_mickeys, (int *mickeyx, int *mickeyy));
! 
  #ifdef __cplusplus
     }
--- 101,112 ----
  AL_FUNC(void, position_mouse, (int x, int y));
  AL_FUNC(void, position_mouse_z, (int z));
! AL_FUNC(void, set_mouse_range, (int x1, int y_1, int x2, int y2));
  AL_FUNC(void, set_mouse_speed, (int xspeed, int yspeed));
! AL_FUNC(void, select_mouse_cursor, (int cursor));
! AL_FUNC(void, set_mouse_cursor_bitmap, (int cursor, struct BITMAP *bmp));
  AL_FUNC(void, set_mouse_sprite_focus, (int x, int y));
  AL_FUNC(void, get_mouse_mickeys, (int *mickeyx, int *mickeyy));
! AL_FUNC(void, set_mouse_sprite, (struct BITMAP *sprite));
! AL_FUNC(int, show_os_cursor, (int cursor));
  #ifdef __cplusplus
     }

Index: fmaths.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/fmaths.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fmaths.h	8 Jun 2003 19:24:56 -0000	1.3
--- fmaths.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 20,30 ***...
 
[truncated message content]

[Timewarp-commit] include/allegro/internal aintern.h, 1.4, 1.5 aintvga.h, 1.3, 1.4 alconfig.h, 1.4, 1.5

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro/internal
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20384/include/allegro/internal

Modified Files:
	aintern.h aintvga.h alconfig.h 
Log Message:


Index: alconfig.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/internal/alconfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** alconfig.h	15 Nov 2003 01:37:38 -0000	1.4
--- alconfig.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 24,27 ****
--- 24,34 ----
  
  
+ /* for backward compatibility */
+ #ifdef USE_CONSOLE
+    #define ALLEGRO_NO_MAGIC_MAIN
+    #define ALLEGRO_USE_CONSOLE
+ #endif
+ 
+ 
  /* include platform-specific stuff */
  #ifndef SCAN_EXPORT
***************
*** 44,47 ****
--- 51,56 ----
     #elif defined ALLEGRO_MPW
        #include "allegro/platform/almaccfg.h"
+    #elif defined ALLEGRO_MACOSX
+       #include "allegro/platform/alosxcfg.h"
     #elif defined ALLEGRO_QNX
        #include "allegro/platform/alqnxcfg.h"
***************
*** 51,54 ****
--- 60,67 ----
        #error platform not supported
     #endif
+ 
+    #ifndef SCAN_DEPEND
+       #include "allegro/platform/astdint.h"
+    #endif
  #endif
  
***************
*** 60,66 ****
     #ifndef AL_INLINE
        #ifdef __cplusplus
!          #define AL_INLINE(type, name, args, code)    static inline type name args code
        #else
!          #define AL_INLINE(type, name, args, code)    extern __inline__ type name args code
        #endif
     #endif
--- 73,83 ----
     #ifndef AL_INLINE
        #ifdef __cplusplus
!          #define AL_INLINE(type, name, args, code)    \
!             static inline type name args;             \
!             static inline type name args code
        #else
!          #define AL_INLINE(type, name, args, code)    \
!             extern __inline__ type name args;         \
!             extern __inline__ type name args code
        #endif
     #endif
***************
*** 97,100 ****
--- 114,123 ----
     #ifdef __i386__
        #define ALLEGRO_I386
+       #define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
+    #endif
+ 
+    #ifdef __amd64__
+       #define ALLEGRO_AMD64
+       #define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
     #endif
  
***************
*** 103,106 ****
--- 126,152 ----
     #endif
  
+    #ifndef AL_FUNC_DEPRECATED
+       #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
+          #define AL_FUNC_DEPRECATED(type, name, args)              AL_FUNC(__attribute__ ((deprecated)) type, name, args)
+          #define AL_PRINTFUNC_DEPRECATED(type, name, args, a, b)   AL_PRINTFUNC(__attribute__ ((deprecated)) type, name, args, a, b)
+          #define AL_INLINE_DEPRECATED(type, name, args, code)      AL_INLINE(__attribute__ ((deprecated)) type, name, args, code)
+       #endif
+    #endif
+ 
+    #ifndef AL_ALIAS
+       #define AL_ALIAS(DECL, CALL)                      \
+       static __attribute__((unused)) __inline__ DECL    \
+       {                                                 \
+          return CALL;                                   \
+       }
+    #endif
+ 
+    #ifndef AL_ALIAS_VOID_RET
+       #define AL_ALIAS_VOID_RET(DECL, CALL)                  \
+       static __attribute__((unused)) __inline__ void DECL    \
+       {                                                      \
+          CALL;                                               \
+       }
+    #endif
  #endif
  
***************
*** 118,121 ****
--- 164,171 ----
   */
  
+ #ifndef _AL_SINCOS
+    #define _AL_SINCOS(x, s, c)  do { (c) = cos(x); (s) = sin(x); } while (0)
+ #endif
+ 
  #ifndef INLINE
     #define INLINE
***************
*** 158,165 ****
--- 208,241 ----
  #endif
  
+ #ifndef AL_FUNCPTRARRAY
+    #define AL_FUNCPTRARRAY(type, name, args)       extern type (*name[]) args
+ #endif
+ 
  #ifndef AL_INLINE
     #define AL_INLINE(type, name, args, code)       type name args;
  #endif
  
+ #ifndef AL_FUNC_DEPRECATED
+    #define AL_FUNC_DEPRECATED(type, name, args)              AL_FUNC(type, name, args)
+    #define AL_PRINTFUNC_DEPRECATED(type, name, args, a, b)   AL_PRINTFUNC(type, name, args, a, b)
+    #define AL_INLINE_DEPRECATED(type, name, args, code)      AL_INLINE(type, name, args, code)
+ #endif
+ 
+ #ifndef AL_ALIAS
+    #define AL_ALIAS(DECL, CALL)              \
+    static INLINE DECL                        \
+    {                                         \
+       return CALL;                           \
+    }
+ #endif
+ 
+ #ifndef AL_ALIAS_VOID_RET
+    #define AL_ALIAS_VOID_RET(DECL, CALL)     \
+    static INLINE void DECL                   \
+    {                                         \
+       CALL;                                  \
+    }
+ #endif
+ 
  #ifndef END_OF_MAIN
     #define END_OF_MAIN()
***************
*** 202,207 ****
--- 278,289 ----
     #define FA_ARCH         32
  #endif
+    #define FA_NONE         0
+    #define FA_ALL          (~FA_NONE)
  
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  /* emulate missing library functions */
  #ifdef ALLEGRO_NO_STRICMP
***************
*** 235,244 ****
  #ifndef ALLEGRO_DJGPP
     #define _farsetsel(seg)
!    #define _farnspokeb(addr, val)   (*((unsigned char  *)(addr)) = (val))
!    #define _farnspokew(addr, val)   (*((unsigned short *)(addr)) = (val))
!    #define _farnspokel(addr, val)   (*((unsigned long  *)(addr)) = (val))
!    #define _farnspeekb(addr)        (*((unsigned char  *)(addr)))
!    #define _farnspeekw(addr)        (*((unsigned short *)(addr)))
!    #define _farnspeekl(addr)        (*((unsigned long  *)(addr)))
  #endif
  
--- 317,326 ----
  #ifndef ALLEGRO_DJGPP
     #define _farsetsel(seg)
!    #define _farnspokeb(addr, val)   (*((uint8_t  *)(addr)) = (val))
!    #define _farnspokew(addr, val)   (*((uint16_t *)(addr)) = (val))
!    #define _farnspokel(addr, val)   (*((uint32_t *)(addr)) = (val))
!    #define _farnspeekb(addr)        (*((uint8_t  *)(addr)))
!    #define _farnspeekw(addr)        (*((uint16_t *)(addr)))
!    #define _farnspeekl(addr)        (*((uint32_t *)(addr)))
  #endif
  
***************
*** 247,267 ****
  #ifdef ALLEGRO_LITTLE_ENDIAN
  
!    #define READ3BYTES(p)  (((int) *(p))               \
!                            | ((int) *((p) + 1) << 8)  \
!                            | ((int) *((p) + 2) << 16))
  
!    #define WRITE3BYTES(p,c)  ((*(p) = (c)),             \
!                               (*((p) + 1) = (c) >> 8),  \
!                               (*((p) + 2) = (c) >> 16))
  
  #elif defined ALLEGRO_BIG_ENDIAN
  
!    #define READ3BYTES(p)  (((int) *(p) << 16)         \
!                            | ((int) *((p) + 1) << 8)  \
!                            | ((int) *((p) + 2)))
  
!    #define WRITE3BYTES(p,c)  ((*(p) = (c) >> 16),       \
!                               (*((p) + 1) = (c) >> 8),  \
!                               (*((p) + 2) = (c)))
  
  #else
--- 329,349 ----
  #ifdef ALLEGRO_LITTLE_ENDIAN
  
!    #define READ3BYTES(p)  ((*(unsigned char *)(p))               \
!                            | (*((unsigned char *)(p) + 1) << 8)  \
!                            | (*((unsigned char *)(p) + 2) << 16))
  
!    #define WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c)),             \
!                               (*((unsigned char *)(p) + 1) = (c) >> 8),  \
!                               (*((unsigned char *)(p) + 2) = (c) >> 16))
  
  #elif defined ALLEGRO_BIG_ENDIAN
  
!    #define READ3BYTES(p)  ((*(unsigned char *)(p) << 16)         \
!                            | (*((unsigned char *)(p) + 1) << 8)  \
!                            | (*((unsigned char *)(p) + 2)))
  
!    #define WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c) >> 16),       \
!                               (*((unsigned char *)(p) + 1) = (c) >> 8),  \
!                               (*((unsigned char *)(p) + 2) = (c)))
  
  #else
***************
*** 276,309 ****
  
  #ifndef bmp_write8
!    #define bmp_write8(addr, c)         (*((unsigned char  *)(addr)) = (c))
!    #define bmp_write15(addr, c)        (*((unsigned short *)(addr)) = (c))
!    #define bmp_write16(addr, c)        (*((unsigned short *)(addr)) = (c))
!    #define bmp_write32(addr, c)        (*((unsigned long  *)(addr)) = (c))
  
!    #define bmp_read8(addr)             (*((unsigned char  *)(addr)))
!    #define bmp_read15(addr)            (*((unsigned short *)(addr)))
!    #define bmp_read16(addr)            (*((unsigned short *)(addr)))
!    #define bmp_read32(addr)            (*((unsigned long  *)(addr)))
  
!       AL_INLINE(int, bmp_read24, (unsigned long addr),
!       {
! 	 unsigned char *p = (unsigned char *)addr;
! 	 int c;
  
        c = READ3BYTES(p);
  
! 	 return c;
!       })
  
!       AL_INLINE(void, bmp_write24, (unsigned long addr, int c),
!       {
! 	 unsigned char *p = (unsigned char *)addr;
  
        WRITE3BYTES(p, c);
!       })
  
  #endif
  
  
  /* parameters for the color conversion code */
  #if (defined ALLEGRO_WINDOWS) || (defined ALLEGRO_QNX)
--- 358,401 ----
  
  #ifndef bmp_write8
!    #define bmp_write8(addr, c)         (*((uint8_t  *)(addr)) = (c))
!    #define bmp_write15(addr, c)        (*((uint16_t *)(addr)) = (c))
!    #define bmp_write16(addr, c)        (*((uint16_t *)(addr)) = (c))
!    #define bmp_write32(addr, c)        (*((uint32_t *)(addr)) = (c))
  
!    #define bmp_read8(addr)             (*((uint8_t  *)(addr)))
!    #define bmp_read15(addr)            (*((uint16_t *)(addr)))
!    #define bmp_read16(addr)            (*((uint16_t *)(addr)))
!    #define bmp_read32(addr)            (*((uint32_t *)(addr)))
  
!    AL_INLINE(int, bmp_read24, (uintptr_t addr),
!    {
!       unsigned char *p = (unsigned char *)addr;
!       int c;
  
        c = READ3BYTES(p);
  
!       return c;
!    })
  
!    AL_INLINE(void, bmp_write24, (uintptr_t addr, int c),
!    {
!       unsigned char *p = (unsigned char *)addr;
  
        WRITE3BYTES(p, c);
!    })
  
  #endif
  
  
+ /* default random function definition */
+ #ifndef AL_RAND
+    #define AL_RAND()       (rand())
+ #endif
+ 
+ #ifdef __cplusplus
+    }
+ #endif
+ 
+ 
  /* parameters for the color conversion code */
  #if (defined ALLEGRO_WINDOWS) || (defined ALLEGRO_QNX)

Index: aintern.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/internal/aintern.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aintern.h	15 Nov 2003 01:37:38 -0000	1.4
--- aintern.h	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 29,36 ****
--- 29,54 ----
  
  
+ /* length in bytes of the cpu_vendor string */
+ #define _AL_CPU_VENDOR_SIZE 32
+ 
+ 
  /* flag for how many times we have been initialised */
  AL_VAR(int, _allegro_count);
  
  
+ /* flag to know whether we are being called by the exit mechanism */
+ AL_VAR(int, _allegro_in_exit);
+ 
+ 
+ /* flag to decide whether to disable the screensaver */
+ enum {
+   NEVER_DISABLED,
+   FULLSCREEN_DISABLED,
+   ALWAYS_DISABLED
+ };
+ 
+ AL_VAR(int, _screensaver_policy);
+ 
+ 
  /* some Allegro functions need a block of scratch memory */
  AL_VAR(void *, _scratch_mem);
***************
*** 55,59 ****
  
  /* list of functions to call at program cleanup */
! AL_FUNC(void, _add_exit_func, (AL_METHOD(void, func, (void))));
  AL_FUNC(void, _remove_exit_func, (AL_METHOD(void, func, (void))));
  
--- 73,77 ----
  
  /* list of functions to call at program cleanup */
! AL_FUNC(void, _add_exit_func, (AL_METHOD(void, func, (void)), AL_CONST char *desc));
  AL_FUNC(void, _remove_exit_func, (AL_METHOD(void, func, (void))));
  
***************
*** 95,98 ****
--- 113,120 ----
  
  
+ /* config stuff */
+ void _reload_config(void);
+ 
+ 
  /* various bits of mouse stuff */
  AL_FUNC(void, _handle_mouse_input, (void));
***************
*** 133,136 ****
--- 155,160 ----
  AL_VAR(volatile int, _retrace_hpp_value);
  
+ AL_VAR(long, _vsync_speed);
+ 
  
  /* various bits of keyboard stuff */
***************
*** 139,149 ****
  
  AL_VAR(int, _keyboard_installed);
! 
  AL_ARRAY(volatile char, _key);
  AL_VAR(volatile int, _key_shifts);
  
  AL_FUNC(void, _pckeys_init, (void));
  AL_FUNC(void, _handle_pckey, (int code));
  AL_FUNC(int,  _pckey_scancode_to_ascii, (int scancode));
  
  AL_VAR(unsigned short *, _key_ascii_table);
--- 163,180 ----
  
  AL_VAR(int, _keyboard_installed);
! AL_ARRAY(AL_CONST char *, _keyboard_common_names);
  AL_ARRAY(volatile char, _key);
  AL_VAR(volatile int, _key_shifts);
  
+ 
+ #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \
+     (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
+ 
+ AL_ARRAY(char *, _pckeys_names);
+ 
  AL_FUNC(void, _pckeys_init, (void));
  AL_FUNC(void, _handle_pckey, (int code));
  AL_FUNC(int,  _pckey_scancode_to_ascii, (int scancode));
+ AL_FUNC(AL_CONST char *, _pckey_scancode_to_name, (int scancode));
  
  AL_VAR(unsigned short *, _key_ascii_table);
***************
*** 173,176 ****
--- 204,211 ----
  AL_VAR(int, _key_standard_kb);
  
+ AL_VAR(char *, _keyboard_layout);
+ 
+ #endif
+ 
  
  /* various bits of joystick stuff */
***************
*** 189,193 ****
  
  AL_FUNC(void, _handle_scrollable_scroll_click, (DIALOG *d, int listsize, int *offset, int height));
! AL_FUNC(void, _handle_scrollable_scroll, (DIALOG *d, int listsize, int *index, int *offset));
  AL_FUNC(void, _handle_listbox_click, (DIALOG *d));
  AL_FUNC(void, _draw_scrollable_frame, (DIALOG *d, int listsize, int offset, int height, int fg_color, int bg));
--- 224,228 ----
  
  AL_FUNC(void, _handle_scrollable_scroll_click, (DIALOG *d, int listsize, int *offset, int height));
! AL_FUNC(void, _handle_scrollable_scroll, (DIALOG *d, int listsize, int *idx, int *offset));
  AL_FUNC(void, _handle_listbox_click, (DIALOG *d));
  AL_FUNC(void, _draw_scrollable_frame, (DIALOG *d, int listsize, int offset, int height, int fg_color, int bg));
***************
*** 205,211 ****
     AL_METHOD(void, render, (AL_CONST FONT *f, AL_CONST char *text, int fg, int bg, BITMAP *bmp, int x, int y));
     AL_METHOD(void, destroy, (FONT *f));
  } FONT_VTABLE;
  
- AL_VAR(FONT, _default_font);
  AL_VAR(FONT_VTABLE, _font_vtable_mono);
  AL_VAR(FONT_VTABLE *, font_vtable_mono);
--- 240,252 ----
     AL_METHOD(void, render, (AL_CONST FONT *f, AL_CONST char *text, int fg, int bg, BITMAP *bmp, int x, int y));
     AL_METHOD(void, destroy, (FONT *f));
+ 
+    AL_METHOD(int, get_font_ranges, (FONT *f));
+    AL_METHOD(int, get_font_range_begin, (FONT *f, int range));
+    AL_METHOD(int, get_font_range_end, (FONT *f, int range));
+    AL_METHOD(FONT *, extract_font_range, (FONT *f, int begin, int end));
+    AL_METHOD(FONT *, merge_fonts, (FONT *f1, FONT *f2));
+    AL_METHOD(int, transpose_font, (FONT *f, int drange));
  } FONT_VTABLE;
  
  AL_VAR(FONT_VTABLE, _font_vtable_mono);
  AL_VAR(FONT_VTABLE *, font_vtable_mono);
***************
*** 238,248 ****
  
  /* bank switching routines (these use a non-C calling convention on i386!) */
! AL_FUNC(unsigned long, _stub_bank_switch, (BITMAP *bmp, int line));
  AL_FUNC(void, _stub_unbank_switch, (BITMAP *bmp));
  AL_FUNC(void, _stub_bank_switch_end, (void));
  
! #ifdef GFX_MODEX
  
! AL_FUNC(unsigned long, _x_bank_switch, (BITMAP *bmp, int line));
  AL_FUNC(void, _x_unbank_switch, (BITMAP *bmp));
  AL_FUNC(void, _x_bank_switch_end, (void));
--- 279,289 ----
  
  /* bank switching routines (these use a non-C calling convention on i386!) */
! AL_FUNC(uintptr_t, _stub_bank_switch, (BITMAP *bmp, int lyne));
  AL_FUNC(void, _stub_unbank_switch, (BITMAP *bmp));
  AL_FUNC(void, _stub_bank_switch_end, (void));
  
! #ifdef GFX_HAS_VGA
  
! AL_FUNC(uintptr_t, _x_bank_switch, (BITMAP *bmp, int lyne));
  AL_FUNC(void, _x_unbank_switch, (BITMAP *bmp));
  AL_FUNC(void, _x_bank_switch_end, (void));
***************
*** 250,254 ****
  #endif
  
! #ifdef GFX_VBEAF
  
  AL_FUNC(void, _accel_bank_stub, (void));
--- 291,295 ----
  #endif
  
! #ifdef GFX_HAS_VBEAF
  
  AL_FUNC(void, _accel_bank_stub, (void));
***************
*** 271,275 ****
  
  /* stuff for setting up bitmaps */
! AL_FUNC(BITMAP *, _make_bitmap, (int w, int h, unsigned long addr, GFX_DRIVER *driver, int color_depth, int bpl));
  AL_FUNC(void, _sort_out_virtual_width, (int *width, GFX_DRIVER *driver));
  
--- 312,316 ----
  
  /* stuff for setting up bitmaps */
! AL_FUNC(BITMAP *, _make_bitmap, (int w, int h, uintptr_t addr, GFX_DRIVER *driver, int color_depth, int bpl));
  AL_FUNC(void, _sort_out_virtual_width, (int *width, GFX_DRIVER *driver));
  
***************
*** 281,285 ****
  
  AL_VAR(int, _refresh_rate_request);
! AL_VAR(int, _current_refresh_rate);
  
  AL_VAR(int, _sub_bitmap_id_count);
--- 322,328 ----
  
  AL_VAR(int, _refresh_rate_request);
! AL_FUNC(void, _set_current_refresh_rate, (int rate));
! 
! AL_VAR(int, _wait_for_vsync);
  
  AL_VAR(int, _sub_bitmap_id_count);
***************
*** 294,304 ****
     #ifdef ALLEGRO_MPW 
        /* in Mac 24 bit is a unsigned long */
!       #define BYTES_PER_PIXEL(bpp)  (((bpp) <= 8) ? 1                                    \
! 				     : (((bpp) <= 16) ? sizeof (unsigned short)          \
! 					: sizeof (unsigned long)))
     #else
!       #define BYTES_PER_PIXEL(bpp)  (((bpp) <= 8) ? 1                                    \
! 				     : (((bpp) <= 16) ? sizeof (unsigned short)          \
! 					: (((bpp) <= 24) ? 3 : sizeof (unsigned long))))
     #endif
  #endif
--- 337,347 ----
     #ifdef ALLEGRO_MPW 
        /* in Mac 24 bit is a unsigned long */
!       #define BYTES_PER_PIXEL(bpp)  (((bpp) <= 8) ? 1					\
! 				     : (((bpp) <= 16) ? 2		\
! 					: 4))
     #else
!       #define BYTES_PER_PIXEL(bpp)  (((bpp) <= 8) ? 1					\
! 				     : (((bpp) <= 16) ? 2		\
! 					: (((bpp) <= 24) ? 3 : 4)))
     #endif
  #endif
***************
*** 327,331 ****
  
  
! /* console switching support */
  AL_FUNC(void, _register_switch_bitmap, (BITMAP *bmp, BITMAP *parent));
  AL_FUNC(void, _unregister_switch_bitmap, (BITMAP *bmp));
--- 370,377 ----
  
  
! /* display switching support */
! AL_FUNC(void, _switch_in, (void));
! AL_FUNC(void, _switch_out, (void));
! 
  AL_FUNC(void, _register_switch_bitmap, (BITMAP *bmp, BITMAP *parent));
  AL_FUNC(void, _unregister_switch_bitmap, (BITMAP *bmp));
***************
*** 344,349 ****
  AL_VAR(unsigned int, _drawing_y_mask);
  
- AL_VAR(int, _textmode);
- 
  AL_FUNCPTR(int *, _palette_expansion_table, (int bpp));
  
--- 390,393 ----
***************
*** 438,443 ****
  
  /* graphics drawing routines */
! AL_FUNC(void, _normal_line, (BITMAP *bmp, int x1, int y1, int x2, int y2, int color));
! AL_FUNC(void, _normal_rectfill, (BITMAP *bmp, int x1, int y1, int x2, int y2, int color));
  
  #ifdef ALLEGRO_COLOR8
--- 482,488 ----
  
  /* graphics drawing routines */
! AL_FUNC(void, _normal_line, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color));
! AL_FUNC(void, _fast_line, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color));
! AL_FUNC(void, _normal_rectfill, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color));
  
  #ifdef ALLEGRO_COLOR8
***************
*** 445,449 ****
  AL_FUNC(int,  _linear_getpixel8, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel8, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline8, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _linear_hline8, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite8, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 490,494 ----
  AL_FUNC(int,  _linear_getpixel8, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel8, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline8, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _linear_hline8, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite8, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 456,461 ****
  AL_FUNC(void, _linear_draw_trans_rle_sprite8, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite8, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character8, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_glyph8, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color));
  AL_FUNC(void, _linear_blit8, (BITMAP *source,BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward8, (BITMAP *source,BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 501,506 ----
  AL_FUNC(void, _linear_draw_trans_rle_sprite8, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite8, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character8, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg));
! AL_FUNC(void, _linear_draw_glyph8, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color, int bg));
  AL_FUNC(void, _linear_blit8, (BITMAP *source,BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward8, (BITMAP *source,BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 468,472 ****
  
  AL_FUNC(void, _linear_putpixel15, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline15, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _linear_hline15, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_trans_sprite15, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 513,517 ----
  
  AL_FUNC(void, _linear_putpixel15, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline15, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _linear_hline15, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_trans_sprite15, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 480,484 ****
  AL_FUNC(int,  _linear_getpixel16, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel16, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline16, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _linear_hline16, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite16, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 525,529 ----
  AL_FUNC(int,  _linear_getpixel16, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel16, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline16, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _linear_hline16, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite16, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 494,499 ****
  AL_FUNC(void, _linear_draw_trans_rgba_rle_sprite16, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite16, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character16, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_glyph16, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color));
  AL_FUNC(void, _linear_blit16, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward16, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 539,544 ----
  AL_FUNC(void, _linear_draw_trans_rgba_rle_sprite16, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite16, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character16, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg));
! AL_FUNC(void, _linear_draw_glyph16, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color, int bg));
  AL_FUNC(void, _linear_blit16, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward16, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 507,511 ****
  AL_FUNC(int,  _linear_getpixel24, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel24, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline24, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _linear_hline24, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite24, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 552,556 ----
  AL_FUNC(int,  _linear_getpixel24, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel24, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline24, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _linear_hline24, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite24, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 521,526 ****
  AL_FUNC(void, _linear_draw_trans_rgba_rle_sprite24, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite24, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character24, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_glyph24, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color));
  AL_FUNC(void, _linear_blit24, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward24, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 566,571 ----
  AL_FUNC(void, _linear_draw_trans_rgba_rle_sprite24, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite24, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character24, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg));
! AL_FUNC(void, _linear_draw_glyph24, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color, int bg));
  AL_FUNC(void, _linear_blit24, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward24, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 534,538 ****
  AL_FUNC(int,  _linear_getpixel32, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel32, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline32, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _linear_hline32, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite32, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 579,583 ----
  AL_FUNC(int,  _linear_getpixel32, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _linear_putpixel32, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _linear_vline32, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _linear_hline32, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _linear_draw_sprite32, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 546,551 ****
  AL_FUNC(void, _linear_draw_trans_rle_sprite32, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite32, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character32, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_glyph32, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color));
  AL_FUNC(void, _linear_blit32, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward32, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 591,596 ----
  AL_FUNC(void, _linear_draw_trans_rle_sprite32, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _linear_draw_lit_rle_sprite32, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _linear_draw_character32, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg));
! AL_FUNC(void, _linear_draw_glyph32, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color, int bg));
  AL_FUNC(void, _linear_blit32, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _linear_blit_backward32, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 555,563 ****
  #endif
  
! #ifdef GFX_MODEX
  
  AL_FUNC(int,  _x_getpixel, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _x_putpixel, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _x_vline, (BITMAP *bmp, int x, int y1, int y2, int color));
  AL_FUNC(void, _x_hline, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _x_draw_sprite, (BITMAP *bmp, BITMAP *sprite, int x, int y));
--- 600,608 ----
  #endif
  
! #ifdef GFX_HAS_VGA
  
  AL_FUNC(int,  _x_getpixel, (BITMAP *bmp, int x, int y));
  AL_FUNC(void, _x_putpixel, (BITMAP *bmp, int x, int y, int color));
! AL_FUNC(void, _x_vline, (BITMAP *bmp, int x, int y_1, int y2, int color));
  AL_FUNC(void, _x_hline, (BITMAP *bmp, int x1, int y, int x2, int color));
  AL_FUNC(void, _x_draw_sprite, (BITMAP *bmp, BITMAP *sprite, int x, int y));
***************
*** 570,575 ****
  AL_FUNC(void, _x_draw_trans_rle_sprite, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _x_draw_lit_rle_sprite, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _x_draw_character, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color));
! AL_FUNC(void, _x_draw_glyph, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color));
  AL_FUNC(void, _x_blit_from_memory, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _x_blit_to_memory, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
--- 615,620 ----
  AL_FUNC(void, _x_draw_trans_rle_sprite, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y));
  AL_FUNC(void, _x_draw_lit_rle_sprite, (BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color));
! AL_FUNC(void, _x_draw_character, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg));
! AL_FUNC(void, _x_draw_glyph, (BITMAP *bmp, AL_CONST FONT_GLYPH *glyph, int x, int y, int color, int bg));
  AL_FUNC(void, _x_blit_from_memory, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
  AL_FUNC(void, _x_blit_to_memory, (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height));
***************
*** 708,718 ****
     int umask, vmask, vshift;        /* texture map size information */
     int seg;                         /* destination bitmap selector */
!    unsigned long zbuf_addr;	    /* Z-buffer address */
!    unsigned long read_addr;	    /* reading address for transparency modes */
  } POLYGON_SEGMENT;
  
  
  /* prototype for the scanline filler functions */
! typedef AL_METHOD(void, SCANLINE_FILLER, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  
--- 753,763 ----
     int umask, vmask, vshift;        /* texture map size information */
     int seg;                         /* destination bitmap selector */
!    uintptr_t zbuf_addr;		    /* Z-buffer address */
!    uintptr_t read_addr;		    /* reading address for transparency modes */
  } POLYGON_SEGMENT;
  
  
  /* prototype for the scanline filler functions */
! typedef AL_METHOD(void, SCANLINE_FILLER, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  
***************
*** 768,809 ****
  
  /* polygon scanline filler functions */
! AL_FUNC(void, _poly_scanline_dummy, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifdef ALLEGRO_COLOR8
  
! AL_FUNC(void, _poly_scanline_gcol8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_grgb8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb8x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_gcol8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans8, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #endif
--- 813,854 ----
  
  /* polygon scanline filler functions */
! AL_FUNC(void, _poly_scanline_dummy, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #ifdef ALLEGRO_COLOR8
  
! AL_FUNC(void, _poly_scanline_gcol8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_grgb8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb8x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_gcol8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans8, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #endif
***************
*** 811,888 ****
  #ifdef ALLEGRO_COLOR16
  
! AL_FUNC(void, _poly_scanline_grgb15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb15x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit15x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit15x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit15x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit15d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_grgb15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans15, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_grgb16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb16x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit16x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit16x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit16x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit16d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans16, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #endif
--- 856,933 ----
  #ifdef ALLEGRO_COLOR16
  
! AL_FUNC(void, _poly_scanline_grgb15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb15x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit15x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit15x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit15x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit15d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit15d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_grgb15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans15, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_grgb16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb16x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit16x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit16x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit16x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit16d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit16d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans16, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #endif
***************
*** 890,932 ****
  #ifdef ALLEGRO_COLOR24
  
! AL_FUNC(void, _poly_scanline_grgb24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb24x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit24x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit24x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit24x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit24d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans24, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #endif
--- 935,977 ----
  #ifdef ALLEGRO_COLOR24
  
! AL_FUNC(void, _poly_scanline_grgb24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb24x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit24x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit24x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit24x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24x, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit24d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit24d, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans24, (uintptr_t addr, int w, POLYGON_SEGMENT *info));
  
  #endif
***************
*** 934,976 ****
  #ifdef ALLEGRO_COLOR32
  
! AL_FUNC(void, _poly_scanline_grgb32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
  #ifndef SCAN_EXPORT
! AL_FUNC(void, _poly_scanline_grgb32x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_lit32x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_lit32x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_atex_mask_lit32x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit32x, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  
! AL_FUNC(void, _poly_scanline_ptex_lit32d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_scanline_ptex_mask_lit32d, (unsigned long addr, int w, POLYGON_SEGMENT *info));
  #endif
  
! AL_FUNC(void, _poly_zbuf_flat32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_grgb32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_lit32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_atex_mask_trans32, (unsigned long addr, int w, POLYGON_SEGMENT *info));
! AL_FUNC(void, _poly_zbuf_ptex_mask_trans32, (unsigned long addr, in...
 
[truncated message content]

[Timewarp-commit] include osxalleg.h, NONE, 1.1 allegro.h, 1.4, 1.5 bealleg.h, 1.3, 1.4 linalleg.h, 1.3, 1.4 macalleg.h, 1.3, 1.4 xalleg.h, 1.3, 1.4

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20384/include

Modified Files:
	allegro.h bealleg.h linalleg.h macalleg.h xalleg.h 
Added Files:
	osxalleg.h 
Log Message:


Index: allegro.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** allegro.h	14 Nov 2003 00:51:19 -0000	1.4
--- allegro.h	2 Jun 2006 14:30:33 -0000	1.5
***************
*** 23,30 ****
  #define ALLEGRO_H
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #include "allegro/base.h"
  
--- 23,26 ----
***************
*** 46,49 ****
--- 42,46 ----
  #include "allegro/compiled.h"
  #include "allegro/text.h"
+ #include "allegro/font.h"
  
  #include "allegro/fli.h"
***************
*** 54,57 ****
--- 51,55 ----
  
  #include "allegro/file.h"
+ #include "allegro/lzss.h"
  #include "allegro/datafile.h"
  
***************
*** 64,83 ****
  #include "allegro/3dmaths.h"
  
! #ifndef ALLEGRO_LIB_BUILD
     #include "allegro/alcompat.h"
  #endif
  
! 
! #ifdef ALLEGRO_EXTRA_HEADER
!    #include ALLEGRO_EXTRA_HEADER
  #endif
  
  
! #ifdef __cplusplus
!    }
! #endif
! 
! #ifdef __cplusplus
! #include "allegro/fix.h"
  #endif
  
--- 62,79 ----
  #include "allegro/3dmaths.h"
  
! 
! #ifndef ALLEGRO_NO_COMPATIBILITY
     #include "allegro/alcompat.h"
  #endif
  
! #ifndef ALLEGRO_NO_FIX_CLASS
!    #ifdef __cplusplus
!       #include "allegro/fix.h"
!    #endif
  #endif
  
  
! #ifdef ALLEGRO_EXTRA_HEADER
!    #include ALLEGRO_EXTRA_HEADER
  #endif
  

Index: linalleg.h
===================================================================
RCS file: /cvsroot/timewarp/include/linalleg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** linalleg.h	8 Jun 2003 19:24:56 -0000	1.3
--- linalleg.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 11,18 ****
   *      Linux header file for the Allegro library.
   *
!  *      This doesn't need to be included; it prototypes functions you
!  *      can use to control the library more closely.
!  *
!  *      By George Foot.
   *
   *      See readme.txt for copyright information.
--- 11,16 ----
   *      Linux header file for the Allegro library.
   *
!  *      This file no longer contains anything.  At the moment,
!  *      it exists only for backwards compatibility.
   *
   *      See readme.txt for copyright information.
***************
*** 23,54 ****
  #define LIN_ALLEGRO_H
  
! #ifdef __cplusplus
!    extern "C" {
! #endif
! 
! #ifndef ALLEGRO_H
! #error Please include allegro.h before linalleg.h!
! #endif
! 
! 
! /******************************************/
! /************ Asynchronous I/O ************/
! /******************************************/
! 
! #define ASYNC_OFF            0x00
! #define ASYNC_DEFAULT        0x01
! #define ASYNC_BSD            0x02
! #define ASYNC_THREADS        0x03
! 
! typedef RETSIGTYPE (*SIGIO_HOOK)(int);
! 
! SIGIO_HOOK al_linux_install_sigio_hook (SIGIO_HOOK hook);
! int al_linux_set_async_mode (unsigned type);
! int al_linux_is_async_mode (void);
! 
! 
! #ifdef __cplusplus
!    }
! #endif
  
  #endif          /* ifndef LIN_ALLEGRO_H */
--- 21,27 ----
  #define LIN_ALLEGRO_H
  
! /*
!  * THIS IS AN EX-PARROT!!
!  */
  
  #endif          /* ifndef LIN_ALLEGRO_H */

Index: xalleg.h
===================================================================
RCS file: /cvsroot/timewarp/include/xalleg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xalleg.h	8 Jun 2003 19:24:56 -0000	1.3
--- xalleg.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 19,26 ****
  #define X_ALLEGRO_H
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #ifndef ALLEGRO_H
  #error Please include allegro.h before xalleg.h!
--- 19,22 ----
***************
*** 31,37 ****
  #include "allegro/platform/aintunix.h"
  
- #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA
- #include <pwd.h>
- #endif
  #include <string.h>
  #include <X11/Xlib.h>
--- 27,30 ----
***************
*** 50,58 ****
  #endif
  
! #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA
! #include <X11/extensions/xf86dga.h>
  #endif
  
  
  /* X-Windows resources used by the library.  */
  extern struct _xwin_type
--- 43,56 ----
  #endif
  
! #ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR
! #include <X11/Xcursor/Xcursor.h>
  #endif
  
  
+ 
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  /* X-Windows resources used by the library.  */
  extern struct _xwin_type
***************
*** 66,73 ****
     Colormap colormap;
     XImage *ximage;
     Cursor cursor;
     int cursor_shape;
  
-    void (*bank_switch)(int line);
     void (*screen_to_buffer)(int sx, int sy, int sw, int sh);
     void (*set_colors)(AL_CONST PALETTE p, int from, int to);
--- 64,75 ----
     Colormap colormap;
     XImage *ximage;
+ #ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR
+    XcursorImage *xcursor_image;
+    XcursorBool support_argb_cursor;
+ #endif
     Cursor cursor;
     int cursor_shape;
+    int hw_cursor_ok;
  
     void (*screen_to_buffer)(int sx, int sy, int sw, int sh);
     void (*set_colors)(AL_CONST PALETTE p, int from, int to);
***************
*** 115,123 ****
     int use_shm;
  
!    int in_dga_mode;
! 
! #ifdef ALLEGRO_XWINDOWS_WITH_XF86DGA
!    int disable_dga_mouse;
! #endif
  
     int keyboard_grabbed;
--- 117,121 ----
     int use_shm;
  
!    int in_dga_mode; /* 0=no, 2=DGA2 */
  
     int keyboard_grabbed;
***************
*** 135,139 ****
     char application_class[1024];
  
!    void (*window_close_hook)(void);
  } _xwin;
  
--- 133,143 ----
     char application_class[1024];
  
!    int drawing_mode_ok;
! 
! #ifdef ALLEGRO_MULTITHREADED
!    void *mutex;
! #endif
! 
!    void (*close_button_callback)(void);
  } _xwin;
  
***************
*** 147,150 ****
--- 151,156 ----
  AL_FUNCPTR (void, _xwin_keyboard_callback, (int, int));
  
+ AL_FUNC(void, xwin_set_window_name, (AL_CONST char *name, AL_CONST char *group));
+ 
  
  

Index: macalleg.h
===================================================================
RCS file: /cvsroot/timewarp/include/macalleg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macalleg.h	8 Jun 2003 19:24:56 -0000	1.3
--- macalleg.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 25,32 ****
  #endif
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #if (!defined SCAN_EXPORT) && (!defined SCAN_DEPEND)
  #endif
--- 25,28 ----
***************
*** 68,71 ****
--- 64,71 ----
  
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  typedef BITMAP BITMAP;
  

Index: bealleg.h
===================================================================
RCS file: /cvsroot/timewarp/include/bealleg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bealleg.h	8 Jun 2003 19:24:56 -0000	1.3
--- bealleg.h	2 Jun 2006 14:30:33 -0000	1.4
***************
*** 44,51 ****
  #ifdef DEBUGMODE
  # define AL_ASSERT(condition)  { if (!(condition)) al_assert(__FILE__, __LINE__); }
- # define AL_TRACE al_trace
  #else
  # define AL_ASSERT(condition)
- # define AL_TRACE 1 ? (void) 0 : al_trace
  #endif
  
--- 44,49 ----
***************
*** 54,57 ****
--- 52,57 ----
  #endif
  
+ #define BE_ALLEGRO_VIEW_DIRECT    1
+ #define BE_ALLEGRO_VIEW_OVERLAY   2
  
  #define LINE8_HOOK_NUM    3
***************
*** 137,145 ****
  {
     public:
!       BeAllegroView(BRect, const char *, uint32, uint32);
!      ~BeAllegroView();
! 
!       void AttachedToWindow();
        void MessageReceived(BMessage *);
  };
  
--- 137,147 ----
  {
     public:
!       BeAllegroView(BRect, const char *, uint32, uint32, int);
!       
        void MessageReceived(BMessage *);
+       void Draw(BRect);
+       
+    private:
+       int flags;
  };
  
***************
*** 147,151 ****
  
  class BeAllegroWindow
!    : public BDirectWindow
  {
     public:
--- 149,153 ----
  
  class BeAllegroWindow
!    : public BWindow
  {
     public:
***************
*** 153,156 ****
--- 155,180 ----
       ~BeAllegroWindow();
  
+       void MessageReceived(BMessage *);
+       bool QuitRequested(void);
+       void WindowActivated(bool);
+       
+       int screen_depth;
+       int screen_width;
+       int screen_height;
+       BBitmap *buffer;
+       BBitmap *aux_buffer;
+       bool dying;
+       thread_id	drawing_thread_id;
+ };
+ 
+ 
+ 
+ class BeAllegroDirectWindow
+    : public BDirectWindow
+ {
+    public:
+       BeAllegroDirectWindow(BRect, const char *, window_look, window_feel, uint32, uint32, uint32, uint32, uint32);
+      ~BeAllegroDirectWindow();
+ 
        void DirectConnected(direct_buffer_info *);
        void MessageReceived(BMessage *);
***************
*** 193,196 ****
--- 217,237 ----
  
  
+ class BeAllegroOverlay
+    : public BWindow
+ {
+    public:
+       BeAllegroOverlay(BRect, const char *, window_look, window_feel, uint32, uint32, uint32, uint32, uint32);
+      ~BeAllegroOverlay();
+ 
+       void MessageReceived(BMessage *);
+       bool QuitRequested(void);
+       void WindowActivated(bool);
+       
+       BBitmap *buffer;
+       rgb_color color_key;
+ };
+ 
+ 
+ 
  class BeAllegroApp
     : public BApplication
***************
*** 207,216 ****
--- 248,260 ----
  AL_VAR(BeAllegroApp, *_be_allegro_app);
  AL_VAR(BeAllegroWindow, *_be_allegro_window);
+ AL_VAR(BeAllegroDirectWindow, *_be_allegro_direct_window);
  AL_VAR(BeAllegroView, *_be_allegro_view);
  AL_VAR(BeAllegroScreen, *_be_allegro_screen);
+ AL_VAR(BeAllegroOverlay, *_be_allegro_overlay);
  AL_VAR(BWindow, *_be_window);
  AL_VAR(BMidiSynth, *_be_midisynth);
  AL_VAR(sem_id, _be_sound_stream_lock);
  AL_VAR(sem_id, _be_fullscreen_lock);
+ AL_VAR(sem_id, _be_window_lock);
  AL_VAR(sem_id, _be_mouse_view_attached);
  AL_VAR(BWindow, *_be_mouse_window);
***************
*** 222,225 ****
--- 266,270 ----
  AL_VAR(volatile int, _be_lock_count);
  AL_VAR(volatile int, _be_focus_count);
+ AL_VAR(volatile bool, _be_gfx_initialized);
  AL_VAR(int, *_be_dirty_lines);
  
***************
*** 230,234 ****
  extern void (*_be_window_close_hook)();
  
! void be_terminate(thread_id caller, bool exit_caller);
  
  
--- 275,282 ----
  extern void (*_be_window_close_hook)();
  
! void _be_terminate(thread_id caller, bool exit_caller);
! void _be_gfx_set_truecolor_shifts();
! void _be_change_focus(bool active);
! bool _be_handle_window_close(const char *title);
  
  

--- NEW FILE: osxalleg.h ---
/*         ______   ___    ___
 *        /\  _  \ /\_ \  /\_ \
 *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
 *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
 *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
 *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
 *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
 *                                           /\____/
 *                                           \_/__/
 *
 *      Main header file for the MacOS X Allegro library port.
 *      Any OS X Allegro specific function is declared here. 
 *
 *      By Angelo Mottola.
 *
 *      See readme.txt for copyright information.
 */


#ifndef OSX_ALLEGRO_H
#define OSX_ALLEGRO_H

#ifndef ALLEGRO_H
#error Please include allegro.h before osxalleg.h!
#endif


#ifdef __cplusplus
extern "C" {
#endif


#ifdef __cplusplus
}
#endif

#endif

[Timewarp-commit] include/allegro/inline 3dmaths.inl, 1.3, 1.4 color.inl, 1.3, 1.4 draw.inl, 1.3, 1.4 file.inl, 1.3, 1.4 fix.inl, 1.3, 1.4 fmaths.inl, 1.3, 1.4 gfx.inl, 1.3, 1.4 rle.inl, 1.3, 1.4 system.inl, 1.4, 1.5

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include/allegro/inline
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20384/include/allegro/inline

Modified Files:
	3dmaths.inl color.inl draw.inl file.inl fix.inl fmaths.inl 
	gfx.inl rle.inl system.inl 
Log Message:


Index: system.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/system.inl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** system.inl	15 Nov 2003 01:37:38 -0000	1.4
--- system.inl	2 Jun 2006 14:30:34 -0000	1.5
***************
*** 20,29 ****
  #define ALLEGRO_SYSTEM_INL
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "allegro/debug.h"
- 
  
  AL_INLINE(void, set_window_title, (AL_CONST char *name),
--- 20,29 ----
  #define ALLEGRO_SYSTEM_INL
  
+ #include "allegro/debug.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  
  AL_INLINE(void, set_window_title, (AL_CONST char *name),
***************
*** 36,65 ****
  
  
- #define ALLEGRO_WINDOW_CLOSE_MESSAGE                                         \
-    "Warning: forcing program shutdown may lead to data loss and unexpected " \
-    "results. It is preferable to use the exit command inside the window. "   \
-    "Proceed anyway?"
- 
- 
- AL_INLINE(int, set_window_close_button, (int enable),
- {
-    ASSERT(system_driver);
- 
-    if (system_driver->set_window_close_button)
-       return system_driver->set_window_close_button(enable);
- 
-    return -1;
- })
- 
- 
- AL_INLINE(void, set_window_close_hook, (AL_METHOD(void, proc, (void))),
- {
-    ASSERT(system_driver);
- 
-    if (system_driver->set_window_close_hook)
-       system_driver->set_window_close_hook(proc);
- })
- 
- 
  AL_INLINE(int, desktop_color_depth, (void),
  {
--- 36,39 ----
***************
*** 84,95 ****
  
  
- AL_INLINE(void, yield_timeslice, (void),
- {
-    ASSERT(system_driver);
- 
-    if (system_driver->yield_timeslice)
-       system_driver->yield_timeslice();
- })
- 
  
  #ifdef __cplusplus
--- 58,61 ----

Index: fmaths.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/fmaths.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fmaths.inl	8 Jun 2003 19:24:56 -0000	1.3
--- fmaths.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 20,32 ****
  #define ALLEGRO_FMATHS_INL
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
- 
  #define ALLEGRO_IMPORT_MATH_ASM
  #include "asm.inl"
  #undef ALLEGRO_IMPORT_MATH_ASM
  
  
  /* ftofix and fixtof are used in generic C versions of fixmul and fixdiv */
--- 20,31 ----
  #define ALLEGRO_FMATHS_INL
  
  #define ALLEGRO_IMPORT_MATH_ASM
  #include "asm.inl"
  #undef ALLEGRO_IMPORT_MATH_ASM
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  
  /* ftofix and fixtof are used in generic C versions of fixmul and fixdiv */
***************
*** 43,47 ****
     }
  
!    return (long)(x * 65536.0 + (x < 0 ? -0.5 : 0.5));
  })
  
--- 42,46 ----
     }
  
!    return (fixed)(x * 65536.0 + (x < 0 ? -0.5 : 0.5));
  })
  
***************
*** 103,110 ****
  
  
! AL_INLINE(fixed, fixmul, (fixed x, fixed y),
! {
!    return ftofix(fixtof(x) * fixtof(y));
! })
  
  
--- 102,146 ----
  
  
! /* In benchmarks conducted circa May 2005 we found that, in the main:
!  * - IA32 machines performed faster with one implementation;
!  * - AMD64 and G4 machines performed faster with another implementation.
!  *
!  * Benchmarks were mainly done with differing versions of gcc.
!  * Results varied with other compilers, optimisation levels, etc.
!  * so this is not optimal, though a tenable compromise.
!  *
!  * Note that the following implementation are NOT what were benchmarked.
!  * We had forgotten to put in overflow detection in those versions.
!  * If you don't need overflow detection then previous versions in the
!  * CVS tree might be worth looking at.
!  *
!  * PS. Don't move the #ifs inside the AL_INLINE; BCC doesn't like it.
!  */
! #if (defined ALLEGRO_I386) || (!defined LONG_LONG)
!    AL_INLINE(fixed, fixmul, (fixed x, fixed y),
!    {
!       return ftofix(fixtof(x) * fixtof(y));
!    })
! #else
!    AL_INLINE(fixed, fixmul, (fixed x, fixed y),
!    {
!       LONG_LONG lx = x;
!       LONG_LONG ly = y;
!       LONG_LONG lres = (lx*ly);
! 
!       if (lres > 0x7FFFFFFF0000LL) {
! 	 *allegro_errno = ERANGE;
! 	 return 0x7FFFFFFF;
!       }
!       else if (lres < -0x7FFFFFFF0000LL) {
! 	 *allegro_errno = ERANGE;
! 	 return 0x80000000;
!       }
!       else {
! 	 int res = lres >> 16;
! 	 return res;
!       }
!    })
! #endif	    /* fixmul() C implementations */
  
  
***************
*** 132,136 ****
  AL_INLINE(int, fixceil, (fixed x),
  {
!    if (x > (long)(0x7FFF0000)) {
        *allegro_errno = ERANGE;
        return 0x7FFF;
--- 168,172 ----
  AL_INLINE(int, fixceil, (fixed x),
  {
!    if (x > 0x7FFF0000) {
        *allegro_errno = ERANGE;
        return 0x7FFF;

Index: file.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/file.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** file.inl	8 Jun 2003 19:24:56 -0000	1.3
--- file.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 1,63 ****
- /*         ______   ___    ___
-  *        /\  _  \ /\_ \  /\_ \
-  *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___
-  *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
-  *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
-  *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
-  *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
-  *                                           /\____/
-  *                                           \_/__/
-  *
-  *      File inline functions (generic C).
-  *
-  *      By Shawn Hargreaves.
-  *
-  *      See readme.txt for copyright information.
-  */
- 
- 
  #ifndef ALLEGRO_FILE_INL
  #define ALLEGRO_FILE_INL
  
! #ifdef __cplusplus
!    extern "C" {
! #endif
! 
! AL_INLINE(int, pack_getc, (PACKFILE *f),
! {
!    f->buf_size--;
!    if (f->buf_size > 0)
!       return *(f->buf_pos++);
!    else
!       return _sort_out_getc(f);
! })
! 
! 
! AL_INLINE(int, pack_putc, (int c, PACKFILE *f),
! {
!    f->buf_size++;
!    if (f->buf_size >= F_BUF_SIZE)
!       return _sort_out_putc(c, f);
!    else
!       return (*(f->buf_pos++) = c);
! })
! 
! 
! AL_INLINE(int, pack_feof, (PACKFILE *f),
! {
!    return (f->flags & PACKFILE_FLAG_EOF);
! })
! 
! 
! AL_INLINE(int, pack_ferror, (PACKFILE *f),
! {
!    return (f->flags & PACKFILE_FLAG_ERROR);
! })
! 
! #ifdef __cplusplus
!    }
! #endif
  
  #endif          /* ifndef ALLEGRO_FILE_INL */
- 
- 
--- 1,6 ----
  #ifndef ALLEGRO_FILE_INL
  #define ALLEGRO_FILE_INL
  
! #warning file.inl should no longer be referenced.
  
  #endif          /* ifndef ALLEGRO_FILE_INL */

Index: gfx.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/gfx.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gfx.inl	8 Jun 2003 19:24:56 -0000	1.3
--- gfx.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 20,34 ****
  #define ALLEGRO_GFX_INL
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #include "allegro/debug.h"
  
- 
  #define ALLEGRO_IMPORT_GFX_ASM
  #include "asm.inl"
  #undef ALLEGRO_IMPORT_GFX_ASM
  
  
  #ifdef ALLEGRO_NO_ASM
--- 20,33 ----
  #define ALLEGRO_GFX_INL
  
  #include "allegro/debug.h"
  
  #define ALLEGRO_IMPORT_GFX_ASM
  #include "asm.inl"
  #undef ALLEGRO_IMPORT_GFX_ASM
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
+ 
  
  #ifdef ALLEGRO_NO_ASM
***************
*** 51,75 ****
      */
  
! AL_FUNC(unsigned long, bmp_write_line, (BITMAP *bmp, int line));
! AL_FUNC(unsigned long, bmp_read_line, (BITMAP *bmp, int line));
  AL_FUNC(void, bmp_unwrite_line, (BITMAP *bmp));
  
  #else
  
! typedef AL_METHOD(unsigned long, _BMP_BANK_SWITCHER, (BITMAP *bmp, int line));
  typedef AL_METHOD(void, _BMP_UNBANK_SWITCHER, (BITMAP *bmp));
  
  
! AL_INLINE(unsigned long, bmp_write_line, (BITMAP *bmp, int line),
  {
     _BMP_BANK_SWITCHER switcher = (_BMP_BANK_SWITCHER)bmp->write_bank;
!    return switcher(bmp, line);
  })
  
  
! AL_INLINE(unsigned long, bmp_read_line, (BITMAP *bmp, int line),
  {
     _BMP_BANK_SWITCHER switcher = (_BMP_BANK_SWITCHER)bmp->read_bank;
!    return switcher(bmp, line);
  })
  
--- 50,74 ----
      */
  
! AL_FUNC(uintptr_t, bmp_write_line, (BITMAP *bmp, int lyne));
! AL_FUNC(uintptr_t, bmp_read_line, (BITMAP *bmp, int lyne));
  AL_FUNC(void, bmp_unwrite_line, (BITMAP *bmp));
  
  #else
  
! typedef AL_METHOD(uintptr_t, _BMP_BANK_SWITCHER, (BITMAP *bmp, int lyne));
  typedef AL_METHOD(void, _BMP_UNBANK_SWITCHER, (BITMAP *bmp));
  
  
! AL_INLINE(uintptr_t, bmp_write_line, (BITMAP *bmp, int lyne),
  {
     _BMP_BANK_SWITCHER switcher = (_BMP_BANK_SWITCHER)bmp->write_bank;
!    return switcher(bmp, lyne);
  })
  
  
! AL_INLINE(uintptr_t, bmp_read_line, (BITMAP *bmp, int lyne),
  {
     _BMP_BANK_SWITCHER switcher = (_BMP_BANK_SWITCHER)bmp->read_bank;
!    return switcher(bmp, lyne);
  })
  
***************
*** 86,89 ****
--- 85,97 ----
  
  
+ AL_INLINE(int, is_windowed_mode, (void),
+ {
+    ASSERT (gfx_driver);
+ 
+    return gfx_driver->windowed;
+ })
+ 
+ 
+ 
  AL_INLINE(void, clear_to_color, (BITMAP *bitmap, int color),
  {
***************
*** 184,188 ****
  
  
- 
  #ifdef ALLEGRO_MPW
  
--- 192,195 ----
***************
*** 225,228 ****
--- 232,279 ----
  #endif
  
+ 
+ AL_INLINE(int, is_inside_bitmap, (BITMAP *bmp, int x, int y, int clip),
+ {
+    ASSERT(bmp);
+ 
+    if (clip) {
+       if (bmp->clip)
+          /* internal clipping is inclusive-exclusive */
+          return (x >= bmp->cl) && (y >= bmp->ct) && (x < bmp->cr) && (y < bmp->cb);
+       else
+          return TRUE;
+    }
+    else
+       /* bitmap dimensions are always non-negative */
+       return (unsigned int)x < (unsigned int)bmp->w && (unsigned int)y < (unsigned int)bmp->h;
+ })
+ 
+ 
+ AL_INLINE(void, get_clip_rect, (BITMAP *bitmap, int *x1, int *y_1, int *x2, int *y2),
+ {
+    ASSERT(bitmap);
+ 
+    /* internal clipping is inclusive-exclusive */
+    *x1 = bitmap->cl;
+    *y_1 = bitmap->ct;
+    *x2 = bitmap->cr-1;
+    *y2 = bitmap->cb-1;
+ })
+ 
+ AL_INLINE(void, set_clip_state, (BITMAP *bitmap, int state),
+ {
+    ASSERT(bitmap);
+ 
+    bitmap->clip = state;
+ })
+ 
+ AL_INLINE(int, get_clip_state, (BITMAP *bitmap),
+ {
+    ASSERT(bitmap);
+ 
+    return bitmap->clip;
+ })
+ 
+ 
  #ifdef __cplusplus
     }

Index: rle.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/rle.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rle.inl	8 Jun 2003 19:24:56 -0000	1.3
--- rle.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 20,29 ****
  #define ALLEGRO_RLE_INL
  
  #ifdef __cplusplus
     extern "C" {
  #endif
  
- #include "allegro/debug.h"
- 
  
  AL_INLINE(void, draw_rle_sprite, (struct BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y),
--- 20,29 ----
  #define ALLEGRO_RLE_INL
  
+ #include "allegro/debug.h"
+ 
  #ifdef __cplusplus
     extern "C" {
  #endif
  
  
  AL_INLINE(void, draw_rle_sprite, (struct BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y),

Index: color.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/color.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** color.inl	8 Jun 2003 19:24:56 -0000	1.3
--- color.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 163,169 ****
  #ifndef ALLEGRO_DOS
  
! AL_INLINE(void, _set_color, (int index, AL_CONST RGB *p),
  {
!    set_color(index, p);
  })
  
--- 163,169 ----
  #ifndef ALLEGRO_DOS
  
! AL_INLINE(void, _set_color, (int idx, AL_CONST RGB *p),
  {
!    set_color(idx, p);
  })
  

Index: fix.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/fix.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fix.inl	8 Jun 2003 19:24:56 -0000	1.3
--- fix.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 222,235 ****
  
  
! inline void cross_product(fix x1, fix y1, fix z1, fix x2, fix y2, fix z2, fix *xout, fix *yout, fix *zout)
  {
!    cross_product(x1.v, y1.v, z1.v, x2.v, y2.v, z2.v, &xout->v, &yout->v, &zout->v);
  }
  
  
! inline fix dot_product(fix x1, fix y1, fix z1, fix x2, fix y2, fix z2)
  {
     fix t;
!    t.v = dot_product(x1.v, y1.v, z1.v, x2.v, y2.v, z2.v);
     return t;
  }
--- 222,235 ----
  
  
! inline void cross_product(fix x1, fix y_1, fix z1, fix x2, fix y2, fix z2, fix *xout, fix *yout, fix *zout)
  {
!    cross_product(x1.v, y_1.v, z1.v, x2.v, y2.v, z2.v, &xout->v, &yout->v, &zout->v);
  }
  
  
! inline fix dot_product(fix x1, fix y_1, fix z1, fix x2, fix y2, fix z2)
  {
     fix t;
!    t.v = dot_product(x1.v, y_1.v, z1.v, x2.v, y2.v, z2.v);
     return t;
  }

Index: 3dmaths.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/3dmaths.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 3dmaths.inl	8 Jun 2003 19:24:56 -0000	1.3
--- 3dmaths.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 25,37 ****
  
  
! AL_INLINE(fixed, dot_product, (fixed x1, fixed y1, fixed z1, fixed x2, fixed y2, fixed z2),
  {
!    return fixmul(x1, x2) + fixmul(y1, y2) + fixmul(z1, z2);
  })
  
  
! AL_INLINE(float, dot_product_f, (float x1, float y1, float z1, float x2, float y2, float z2),
  {
!    return (x1 * x2) + (y1 * y2) + (z1 * z2);
  })
  
--- 25,37 ----
  
  
! AL_INLINE(fixed, dot_product, (fixed x1, fixed y_1, fixed z1, fixed x2, fixed y2, fixed z2),
  {
!    return fixmul(x1, x2) + fixmul(y_1, y2) + fixmul(z1, z2);
  })
  
  
! AL_INLINE(float, dot_product_f, (float x1, float y_1, float z1, float x2, float y2, float z2),
  {
!    return (x1 * x2) + (y_1 * y2) + (z1 * z2);
  })
  

Index: draw.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/draw.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** draw.inl	8 Jun 2003 19:24:56 -0000	1.3
--- draw.inl	2 Jun 2006 14:30:34 -0000	1.4
***************
*** 20,30 ****
  #define ALLEGRO_DRAW_INL
  
- #ifdef __cplusplus
-    extern "C" {
- #endif
- 
  #include "allegro/debug.h"
  #include "gfx.inl"
  
  
  AL_INLINE(int, getpixel, (BITMAP *bmp, int x, int y),
--- 20,30 ----
  #define ALLEGRO_DRAW_INL
  
  #include "allegro/debug.h"
+ #include "allegro/3d.h"
  #include "gfx.inl"
  
+ #ifdef __cplusplus
+    extern "C" {
+ #endif
  
  AL_INLINE(int, getpixel, (BITMAP *bmp, int x, int y),
***************
*** 44,56 ****
  
  
! AL_INLINE(void, vline, (BITMAP *bmp, int x, int y1, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->vline(bmp, x, y1, y2, color);
  })
  
  
! AL_INLINE(void, hline, (BITMAP *bmp, int x1, int y, int x2, int color),
  {
     ASSERT(bmp);
--- 44,56 ----
  
  
! AL_INLINE(void, _allegro_vline, (BITMAP *bmp, int x, int y_1, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->vline(bmp, x, y_1, y2, color);
  })
  
  
! AL_INLINE(void, _allegro_hline, (BITMAP *bmp, int x1, int y, int x2, int color),
  {
     ASSERT(bmp);
***************
*** 60,79 ****
  
  
! AL_INLINE(void, line, (BITMAP *bmp, int x1, int y1, int x2, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->line(bmp, x1, y1, x2, y2, color);
  })
  
  
! AL_INLINE(void, rectfill, (BITMAP *bmp, int x1, int y1, int x2, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->rectfill(bmp, x1, y1, x2, y2, color);
  })
  
  
  AL_INLINE(void, draw_sprite, (BITMAP *bmp, BITMAP *sprite, int x, int y),
  {
--- 60,239 ----
  
  
! /* The curses API also contains functions called vline and hline so we have
!  * called our functions _allegro_vline and _allegro_hline.  User programs
!  * should use the vline/hline aliases as they are the official names.
!  */
! #ifndef ALLEGRO_NO_VHLINE_ALIAS
!    AL_ALIAS_VOID_RET(vline(BITMAP *bmp, int x, int y_1, int y2, int color), _allegro_vline(bmp, x, y_1, y2, color))
!    AL_ALIAS_VOID_RET(hline(BITMAP *bmp, int x1, int y, int x2, int color),  _allegro_hline(bmp, x1, y, x2, color))
! #endif
! 
! 
! AL_INLINE(void, line, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->line(bmp, x1, y_1, x2, y2, color);
  })
  
  
! AL_INLINE(void, fastline, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color),
  {
     ASSERT(bmp);
  
!    bmp->vtable->fastline(bmp, x1, y_1, x2, y2, color);
! })
! 
! 
! AL_INLINE(void, rectfill, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->rectfill(bmp, x1, y_1, x2, y2, color);
! })
! 
! 
! AL_INLINE(void, triangle, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int x3, int y3, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->triangle(bmp, x1, y_1, x2, y2, x3, y3, color);
! })
! 
! 
! AL_INLINE(void, polygon, (BITMAP *bmp, int vertices, AL_CONST int *points, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->polygon(bmp, vertices, points, color);
! })
! 
! 
! AL_INLINE(void, rect, (BITMAP *bmp, int x1, int y_1, int x2, int y2, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->rect(bmp, x1, y_1, x2, y2, color);
! })
! 
! 
! AL_INLINE(void, circle, (BITMAP *bmp, int x, int y, int radius, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->circle(bmp, x, y, radius, color);
! })
! 
! 
! AL_INLINE(void, circlefill, (BITMAP *bmp, int x, int y, int radius, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->circlefill(bmp, x, y, radius, color);
! })
! 
! 
! 
! AL_INLINE(void, ellipse, (BITMAP *bmp, int x, int y, int rx, int ry, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->ellipse(bmp, x, y, rx, ry, color);
! })
! 
! 
! 
! AL_INLINE(void, ellipsefill, (BITMAP *bmp, int x, int y, int rx, int ry, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->ellipsefill(bmp, x, y, rx, ry, color);
! })
! 
! 
! 
! AL_INLINE(void, arc, (BITMAP *bmp, int x, int y, fixed ang1, fixed ang2, int r, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->arc(bmp, x, y, ang1, ang2, r, color);
! })
! 
! 
! 
! AL_INLINE(void, spline, (BITMAP *bmp, AL_CONST int points[8], int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->spline(bmp, points, color);
! })
! 
! 
! 
! AL_INLINE(void, floodfill, (BITMAP *bmp, int x, int y, int color),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->floodfill(bmp, x, y, color);
! })
! 
! 
! 
! AL_INLINE(void, polygon3d, (BITMAP *bmp, int type, BITMAP *texture, int vc, V3D *vtx[]),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->polygon3d(bmp, type, texture, vc, vtx);
! })
! 
! 
! 
! AL_INLINE(void, polygon3d_f, (BITMAP *bmp, int type, BITMAP *texture, int vc, V3D_f *vtx[]),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->polygon3d_f(bmp, type, texture, vc, vtx);
! })
! 
! 
! 
! AL_INLINE(void, triangle3d, (BITMAP *bmp, int type, BITMAP *texture, V3D *v1, V3D *v2, V3D *v3),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->triangle3d(bmp, type, texture, v1, v2, v3);
! })
! 
! 
! 
! AL_INLINE(void, triangle3d_f, (BITMAP *bmp, int type, BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->triangle3d_f(bmp, type, texture, v1, v2, v3);
! })
! 
! 
! 
! AL_INLINE(void, quad3d, (BITMAP *bmp, int type, BITMAP *texture, V3D *v1, V3D *v2, V3D *v3, V3D *v4),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->quad3d(bmp, type, texture, v1, v2, v3, v4);
! })
! 
! 
! 
! AL_INLINE(void, quad3d_f, (BITMAP *bmp, int type, BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3, V3D_f *v4),
! {
!    ASSERT(bmp);
! 
!    bmp->vtable->quad3d_f(bmp, type, texture, v1, v2, v3, v4);
  })
  
  
+ 
+ 
+ 
  AL_INLINE(void, draw_sprite, (BITMAP *bmp, BITMAP *sprite, int x, int y),
  {
***************
*** 147,151 ****
  
  
! AL_INLINE(void, draw_character, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color),
  {
     ASSERT(bmp);
--- 307,321 ----
  
  
! AL_INLINE(void, draw_gouraud_sprite, (BITMAP *bmp, BITMAP *sprite, int x, int y, int c1, int c2, int c3, int c4),
! {
!    ASSERT(bmp);
!    ASSERT(sprite);
!    ASSERT(bmp->vtable->color_depth == sprite->vtable->color_depth);
! 
!    bmp->vtable->draw_gouraud_sprite(bmp, sprite, x, y, c1, c2, c3, c4);
! })
! 
! 
! AL_INLINE(void, draw_character_ex, (BITMAP *bmp, BITMAP *sprite, int x, int y, int color, int bg),
  {
     ASSERT(bmp);
***************
*** 153,157 ****
     ASSERT(sprite->vtable->color_depth == 8);
  
!    bmp->vtable->draw_character(bmp, sprite, x, y, color);
  })
  
--- 323,327 ----
     ASSERT(sprite->vtable->color_depth == 8);
  
!    bmp->vtable->draw_character(bmp, sprite, x, y, color, bg);
  })
  
***************
*** 243,247 ****
  AL_INLINE(void, _putpixel, (BITMAP *bmp, int x, int y, int color),
  {
!    unsigned long addr;
  
     bmp_select(bmp);
--- 413,417 ----
  AL_INLINE(void, _putpixel, (BITMAP *bmp, int x, int y, int color),
  {
!    uintptr_t addr;
  
     bmp_select(bmp);
***************
*** 254,258 ****
  AL_INLINE(int, _getpixel, (BITMAP *bmp, int x, int y),
  {
!    unsigned long addr;
     int c;
  
--- 424,428 ----
  AL_INLINE(int, _getpixel, (BITMAP *bmp, int x, int y),
  {
!    uintptr_t addr;
     int c;
  
***************
*** 268,272 ****
  AL_INLINE(void, _putpixel15, (BITMAP *bmp, int x, int y, int color),
  {
!    unsigned long addr;
  
     bmp_select(bmp);
--- 438,442 ----
  AL_INLINE(void, _putpixel15, (BITMAP *bmp, int x, int y, int color),
  {
!    uintptr_t addr;
  
     bmp_select(bmp);
***************
*** 279,283 ****
  AL_INLINE(int, _getpixel15, (BITMAP *bmp, int x, int y),
  {
!    unsigned long addr;
     int c;
  
--- 449,453 ----
  AL_INLINE(int, _getpixel15, (BITMAP *bmp, int x, int y),
  {
!    uintptr_t addr;
     int c;
  
***************
*** 293,297 ****
  AL_INLINE(void, _putpixel16, (BITMAP *bmp, int x, int y, int color),
  {
!    unsigned long addr;
  
     bmp_select(bmp);
--- 463,467 ----
  AL_INLINE(void, _putpixel16, (BITMAP *bmp, int x, int y, int color),
  {
!    uintptr_t addr;
  
     bmp_select(bmp);
***************
*** 304,308 ****
  AL_INLINE(int, _getpixel16, (BITMAP *bmp, int x, int y),
  {
!    unsigned long addr;
     int c;
  
--- 474,478 ----
  AL_INLINE(int, _getpixel16, (BITMAP *bmp, int x, int y),
  {
!    uintptr_t addr;
     int c;
  
***************
*** 318,322 ****
  AL_INLINE(void, _putpixel24, (BITMAP *bmp, int x, int y, int color),
  {
!    unsigned long addr;
  
     bmp_select(bmp);
--- 488,492 ----
  AL_INLINE(void, _putpixel24, (BITMAP *bmp, int x, int y, int color),
  {
!    uintptr_t addr;
  
     bmp_select(bmp);
***************
*** 329,333 ****
  AL_INLINE(int, _getpixel24, (BITMAP *bmp, int x, int y),
  {
!    unsigned long addr;
     int c;
  
--- 499,503 ----
  AL_INLINE(int, _getpixel24, (BITMAP *bmp, int x, int y),
  {
!    uintptr_t addr;
     int c;
  
***************
*** 343,351 ****
  AL_INLINE(void, _putpixel32, (BITMAP *bmp, int x, int y, int color),
  {
!    unsigned long addr;
  
     bmp_select(bmp);
     addr = bmp_write_line(bmp, y);
!    bmp_write32(addr+x*sizeof(long), color);
     bmp_unwrite_line(bmp);
  })
--- 513,521 ----
  AL_INLINE(void, _putpixel32, (BITMAP *bmp, int x, int y, int color),
  {
!    uintptr_t addr;
  
     bmp_select(bmp);
     addr = bmp_write_line(bmp, y);
!    bmp_write32(addr+x*sizeof(int32_t), color);
     bmp_unwrite_line(bmp);
  })
***************
*** 354,363 ****
  AL_INLINE(int, _getpixel32, (BITMAP *bmp, int x, int y),
  {
!    unsigned long addr;
     int c;
  
     bmp_select(bmp);
     addr = bmp_read_line(bmp, y);
!    c = bmp_read32(addr+x*sizeof(long));
     bmp_unwrite_line(bmp);
  
--- 524,533 ----
  AL_INLINE(int, _getpixel32, (BITMAP *bmp, int x, int y),
  {
!    uintptr_t addr;
     int c;
  
     bmp_select(bmp);
     addr = bmp_read_line(bmp, y);
!    c = bmp_read32(addr+x*sizeof(int32_t));
     bmp_unwrite_line(bmp);
  

[Timewarp-commit] include lauxlib.h, 1.4, NONE lua.h, 1.4, NONE lualib.h, 1.4, NONE

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19930/include

Removed Files:
	lauxlib.h lua.h lualib.h 
Log Message:


--- lualib.h DELETED ---

--- lauxlib.h DELETED ---

--- lua.h DELETED ---

[Timewarp-commit] alld42.dll,NONE,1.1 alleg42.dll,NONE,1.1

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17829

Added Files:
	alld42.dll alleg42.dll 
Log Message:


--- NEW FILE: alld42.dll ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: alleg42.dll ---
(This appears to be a binary file; contents omitted.)

[Timewarp-commit] lib lua.lib,1.3,NONE luad.lib,1.1,NONE

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17373/lib

Removed Files:
	lua.lib luad.lib 
Log Message:


--- lua.lib DELETED ---

--- luad.lib DELETED ---

[Timewarp-commit] lib alld.lib,1.4,1.5 alleg.lib,1.3,1.4

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16881/lib

Added Files:
	alld.lib alleg.lib 
Log Message:


--- NEW FILE: alld.lib ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: alleg.lib ---
(This appears to be a binary file; contents omitted.)

[Timewarp-commit] lib aldat.lib, 1.2, NONE alld.exp, 1.2, NONE alld.lib, 1.3, NONE alld40.def, 1.1, NONE alld40.dll, 1.2, NONE alld40.ilk, 1.1, NONE alld40.pdb, 1.1, NONE alleg.exp, 1.2, NONE alleg.lib, 1.2, NONE alleg40.def, 1.1, NONE alleg40.dll, 1.2, NONE allegro.def, 1.1, NONE allp.exp, 1.1, NONE allp.lib, 1.1, NONE allp40.dll, 1.1, NONE allp40.map, 1.1, NONE liballd.a, 1.1, NONE liballeg.a, 1.1, NONE

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15124/lib

Removed Files:
	aldat.lib alld.exp alld.lib alld40.def alld40.dll alld40.ilk 
	alld40.pdb alleg.exp alleg.lib alleg40.def alleg40.dll 
	allegro.def allp.exp allp.lib allp40.dll allp40.map liballd.a 
	liballeg.a 
Log Message:


--- alld.lib DELETED ---

--- alld40.dll DELETED ---

--- alld40.pdb DELETED ---

--- allegro.def DELETED ---

--- aldat.lib DELETED ---

--- liballeg.a DELETED ---

--- alleg.exp DELETED ---

--- alld.exp DELETED ---

--- allp40.dll DELETED ---

--- allp.exp DELETED ---

--- alld40.ilk DELETED ---

--- liballd.a DELETED ---

--- allp40.map DELETED ---

--- alleg.lib DELETED ---

--- alleg40.dll DELETED ---

--- alleg40.def DELETED ---

--- allp.lib DELETED ---

--- alld40.def DELETED ---

[Timewarp-commit] source/games gsc1arena.cpp, 1.2, 1.3 vgGenSys.cpp, 1.14, 1.15

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5726/source/games

Modified Files:
	gsc1arena.cpp vgGenSys.cpp 
Log Message:


Index: gsc1arena.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsc1arena.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gsc1arena.cpp	29 Jan 2006 21:06:15 -0000	1.2
--- gsc1arena.cpp	2 Jun 2006 13:53:29 -0000	1.3
***************
*** 389,392 ****
--- 389,393 ----
  
  
+ 	clear_to_color(screen, 0);
  
  //	AreaReserve *A;
***************
*** 398,401 ****
--- 399,403 ----
  	if (!temp_screen)
  		temp_screen = create_bitmap(screen->w, screen->h);
+ 	clear_to_color(temp_screen, 0);
  
  	// this uses a log_file as well ... to determine the ref screen size.

Index: vgGenSys.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/vgGenSys.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** vgGenSys.cpp	11 Jul 2005 00:25:12 -0000	1.14
--- vgGenSys.cpp	2 Jun 2006 13:53:29 -0000	1.15
***************
*** 816,819 ****
--- 816,821 ----
  		popupl->center();
  
+ 		clear_to_color(screen, 0);
+ 
  		show_mouse(screen);
  		unscare_mouse();

[Timewarp-commit] source/menu editkeys.cpp, NONE, 1.1 editkeys.h, NONE, 1.1

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/menu
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5658/source/menu

Added Files:
	editkeys.cpp editkeys.h 
Log Message:


--- NEW FILE: editkeys.h ---


#ifndef __EDIT_KEYS_H
#define __EDIT_KEYS_H

void ControlHuman_setup(int config_num);

#endif


--- NEW FILE: editkeys.cpp ---

#include <allegro.h>

#include <stdio.h>
#include <string.h>

#include "melee.h"

#include "ais.h"
#include "melee/mship.h"
#include "gui.h"



#define JOY_DIALOG_BOX          0
#define JOY_DIALOG_TITLE        1
#define JOY_DIALOG_CALIBRATE    2
#define JOY_DIALOG_SWITCH       3
#define JOY_DIALOG_DONE         4
#define JOY_DIALOG_DESCRIPTION  5

DIALOG joyDialog[] = {
  // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
  { d_box_proc,        40,   40,   200,  250,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
  { d_textbox_proc,    50,   50,   180,  30,   255,  0,    0,    0,       0,    0,    (char*)"Joystick Calibration", NULL, NULL },
	{ my_d_button_proc,  50,   100,  180,  30,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[0], NULL, NULL },
  { my_d_button_proc,  50,   140,  100,  30,   255,  0,    0,    D_EXIT,  0,    0,    (char*)"Next Joystick", NULL, NULL },
  { my_d_button_proc,  160,  140,  70,   30,   255,  0,    0,    D_EXIT,  0,    0,    (char*)"Done", NULL, NULL },
  { d_textbox_proc,    50,   180,  180,  100,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
  { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
  { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
};

void calibrate_joysticks() {
	int i;
	const char *cal;

	if (!num_joysticks) {
		tw_alert("No joysticks detected", "Done");
		return;
	}

	int which_joystick = 0;
	while (true) {
		if(poll_joystick() != 0)
			return;
		if (::joy[which_joystick].flags & JOYFLAG_CALIBRATE) {
			cal = calibrate_joystick_name(which_joystick);
			if (cal)
				sprintf(dialog_string[0], "Calibrate : %s", cal);
			else
				sprintf(dialog_string[0], "Calibrate : ?");
		}	else
			sprintf (dialog_string[0], "De-Calibrate");

		char buffy[1024];
		char *d = buffy;

		d += sprintf(d, "Joystick %d\n\n", which_joystick);

		for (i = 0; i < ::joy[which_joystick].num_sticks; i += 1) {
			d += sprintf(d, "%s %d\n", ::joy[which_joystick].stick[i].name, i);
		}

		d += sprintf(d, "\nBUTTONS\n");
		for (i = 0; i < ::joy[which_joystick].num_buttons; i += 1) {
			d += sprintf(d, " %s", ::joy[which_joystick].button[i].name);
		}
		
		joyDialog[JOY_DIALOG_DESCRIPTION].dp = buffy;
		i = tw_popup_dialog(NULL,joyDialog, 1);
		if (i == -1)
			i = JOY_DIALOG_DONE;

		switch (i) {
			case JOY_DIALOG_SWITCH:
				if (num_joysticks)
					which_joystick = (which_joystick + 1) % num_joysticks; 
			  break;
			case JOY_DIALOG_DONE:
				return;
			case JOY_DIALOG_CALIBRATE:
				if (::joy[which_joystick].flags & JOYFLAG_CALIBRATE) {
					calibrate_joystick(which_joystick);
					save_joystick_data("joys.ini");
				} else {
					delete_file("joys.ini");
					remove_joystick();
					install_joystick(JOY_TYPE_AUTODETECT);
				}
			  break;
		}
	}
}



#define KEY_DIALOG_MODIFY    0
#define KEY_DIALOG_OK        17
#define KEY_DIALOG_CANCEL    18
#define KEY_DIALOG_CALIBRATE 19
#define KEY_DIALOG_PREV_PLAYER 20
#define KEY_DIALOG_NEXT_PLAYER 21

DIALOG keyDialog[] = {
  // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
  { d_textbox_proc,    0,    0,    160,  80,   255,  0,    0,    0,       0,    0,    dialog_string[0], NULL, NULL },
  { my_d_button_proc,  60,   90,   500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[1], NULL, NULL },
  { my_d_button_proc,  60,   120,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[2], NULL, NULL },
  { my_d_button_proc,  60,   150,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[3], NULL, NULL },
  { my_d_button_proc,  60,   180,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[4], NULL, NULL },
  { my_d_button_proc,  60,   210,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[5], NULL, NULL },
  { my_d_button_proc,  60,   240,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[6], NULL, NULL },
  { my_d_button_proc,  60,   270,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[7], NULL, NULL },
  { my_d_button_proc,  60,   300,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[8], NULL, NULL },
  { my_d_button_proc,  60,   330,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[9], NULL, NULL },
  { my_d_button_proc,  60,   360,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[10], NULL, NULL },
  { my_d_button_proc,  60,   375,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[11], NULL, NULL },
  { my_d_button_proc,  60,   390,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[12], NULL, NULL },
  { my_d_button_proc,  60,   405,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[13], NULL, NULL },
  { my_d_button_proc,  60,   420,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[14], NULL, NULL },
  { my_d_button_proc,  60,   435,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[15], NULL, NULL },
  { my_d_button_proc,  60,   450,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[16], NULL, NULL },

  { my_d_button_proc,  260,  20,   120,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Apply Changes", NULL, NULL },
  { d_button_proc,     260,  50,   120,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Reload Keys", NULL, NULL },

  { my_d_button_proc,  400,  35,   160,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Calibrate Joysticks", NULL, NULL },

  { my_d_button_proc,  180,  20,   60,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"prev", NULL, NULL },
  { my_d_button_proc,  180,  50,   60,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"next", NULL, NULL },
  
  { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
  { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
};


static player_keys userkeys;
static char player_id[512];


void load_keys(int config_num)
{
	sprintf (player_id, "Config%d", config_num);
	player_keys_load_write(&userkeys, "scp.ini", player_id, key_load);
}

void write_keys(int config_num)
{
	sprintf (player_id, "Config%d", config_num);
	player_keys_load_write(&userkeys, "scp.ini", player_id, key_write);
}
	
/*! \brief setap players keys */
void ControlHuman_setup(int config_num)
{

	if (config_num < 0)
		config_num = 0;
	if (config_num > 3)
		config_num = 3;

	load_keys(config_num);


	int i, t = 0;
	int last = 0;
	while (true) {
		char *s;
		int index = 0;

		s = dialog_string[index]; index += 1;

		s += sprintf(s, "Set key configuration %i", config_num+1);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Left:           ");
		key_to_description(userkeys.left, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Right:          ");
		key_to_description(userkeys.right, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Thrust:         ");
		key_to_description(userkeys.thrust, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Backwards:      ");
		key_to_description(userkeys.back, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Fire:           ");
		key_to_description(userkeys.fire, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Special:        ");
		key_to_description(userkeys.special, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "AltFire:        ");
		key_to_description(userkeys.altfire, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Next Target:    ");
		key_to_description(userkeys.next, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Prev Target:    ");
		key_to_description(userkeys.prev, s);
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Closest Target: ");
		key_to_description ( userkeys.closest, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Extra1: ");
		key_to_description ( userkeys.extra1, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Extra2: ");
		key_to_description ( userkeys.extra2, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Communicate: ");
		key_to_description ( userkeys.communicate, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Decrease Lag: ");
		key_to_description ( userkeys.dec_lag, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Increase Lag: ");
		key_to_description ( userkeys.inc_lag, s );
		s = dialog_string[index]; index += 1;

		s += sprintf ( s, "Suicide: ");
		key_to_description ( userkeys.suicide, s );

		s = dialog_string[index]; index += 1;

		int maxlen = 0;
		for (i = 1; i < KEY_DIALOG_OK; i += 1) {
			int t = strlen(dialog_string[i]);
			if (maxlen < t) maxlen = t;
		}
		for (i = 1; i < KEY_DIALOG_OK; i += 1) {
			int t = strlen(dialog_string[i]);
			dialog_string[i][maxlen] = 0; 
			memset(dialog_string[i]+t, ' ', maxlen-t);
		}
		clear_keybuf();
		if (last < KEY_DIALOG_OK) last += 1;
		i = tw_do_dialog(NULL, keyDialog, last);
		if (i == -1) return;
		if (i < KEY_DIALOG_OK) {
			t = get_key();
			clear_keybuf();
		}
		if (t == KEY_ESC)
			return;

		switch (i) {
			case 1:  userkeys.left        = t; break;
			case 2:  userkeys.right       = t; break;
			case 3:  userkeys.thrust      = t; break;
			case 4:  userkeys.back	     = t; break;
			case 5:  userkeys.fire        = t; break;
			case 6:  userkeys.special     = t; break;
			case 7:  userkeys.altfire     = t; break;
			case 8:  userkeys.next        = t; break;
			case 9:  userkeys.prev        = t; break;
			case 10: userkeys.closest     = t; break;
			case 11: userkeys.extra1      = t; break;
			case 12: userkeys.extra2      = t; break;
			case 13: userkeys.communicate = t; break;
			case 14: userkeys.dec_lag     = t; break;
			case 15: userkeys.inc_lag     = t; break;
			case 16: userkeys.suicide     = t; break;
			case KEY_DIALOG_OK:  write_keys(config_num); break;
			case KEY_DIALOG_CANCEL: load_keys(config_num); break;
			case KEY_DIALOG_CALIBRATE: calibrate_joysticks(); break;

			case KEY_DIALOG_PREV_PLAYER:
				--config_num;
				if (config_num < 0) config_num = 3;
				load_keys(config_num);
				break;

			case KEY_DIALOG_NEXT_PLAYER:
				++config_num;
				if (config_num > 3) config_num = 0;
				load_keys(config_num);
				break;
		}
	}
}

[Timewarp-commit] source/menu editteams.cpp, 1.1, 1.2 mainmenu.cpp, 1.1, 1.2

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/menu
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source/menu

Modified Files:
	editteams.cpp mainmenu.cpp 
Log Message:


Index: editteams.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/menu/editteams.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editteams.cpp	2 Jun 2006 08:10:55 -0000	1.1
--- editteams.cpp	2 Jun 2006 13:38:22 -0000	1.2
***************
*** 12,17 ****
  #include "../melee/mgame.h"
  
  
! 
  Control *load_player(int i) {STACKTRACE
  	char tmp[32];
--- 12,18 ----
  #include "../melee/mgame.h"
  
+ #include "editkeys.h"
  
! /*
  Control *load_player(int i) {STACKTRACE
  	char tmp[32];
***************
*** 24,27 ****
--- 25,29 ----
  	return r;
  }
+ */
  
  // TEAMS - dialog objects
***************
*** 83,87 ****
  			teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1 += 1;
  		}
! 		else if ((a == TEAMS_DIALOG_SETUP) || (a == TEAMS_DIALOG_PLAYERLIST)) {
  			Control *tmpc = load_player(teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1);
  			if (tmpc) {
--- 85,95 ----
  			teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1 += 1;
  		}
! 		else if ((a == TEAMS_DIALOG_SETUP) || (a == TEAMS_DIALOG_PLAYERLIST))
! 		{
! 			int iplayer = player_config[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1];
! 			showTitle();
! 			ControlHuman_setup(iplayer);
! 			showTitle();
! 			/*
  			Control *tmpc = load_player(teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1);
  			if (tmpc) {
***************
*** 91,94 ****
--- 99,103 ----
  				showTitle();
  			}
+ 			*/
  		}
  		else if (a == TEAMS_DIALOG_TEAM_NUM) {

Index: mainmenu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/menu/mainmenu.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mainmenu.cpp	2 Jun 2006 08:10:55 -0000	1.1
--- mainmenu.cpp	2 Jun 2006 13:38:22 -0000	1.2
***************
*** 66,81 ****
  
  enum {
! 	MAIN_DIALOG_BOX = 0,
! 	MAIN_DIALOG_NET_JOIN,
  	MAIN_DIALOG_NET_HOST,
  	MAIN_DIALOG_MELEE,
  	MAIN_DIALOG_SC1ARENA,
  	MAIN_DIALOG_OTHER_GAME,
- 	MAIN_DIALOG_OPTIONS,
- 	MAIN_DIALOG_HELP,
- 	MAIN_DIALOG_EXIT,
  	MAIN_DIALOG_EDITFLEET,
  	MAIN_DIALOG_TEAMS,
! 	MELEE_EX_DIALOG_SHIPINFO
  
  };
--- 66,81 ----
  
  enum {
! //	MAIN_DIALOG_BOX = 0,
! 	MAIN_DIALOG_NET_JOIN = 0,
  	MAIN_DIALOG_NET_HOST,
  	MAIN_DIALOG_MELEE,
  	MAIN_DIALOG_SC1ARENA,
  	MAIN_DIALOG_OTHER_GAME,
  	MAIN_DIALOG_EDITFLEET,
  	MAIN_DIALOG_TEAMS,
! 	MAIN_DIALOG_OPTIONS,
! 	MELEE_EX_DIALOG_SHIPINFO,
! 	MAIN_DIALOG_HELP,
! 	MAIN_DIALOG_EXIT
  
  };
***************
*** 83,87 ****
  DIALOG mainDialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
!   { d_shadow_box_proc, 40,   40,   180,  285,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { my_d_button_proc,  45,   45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Join" , NULL, NULL }, //MAIN_DIALOG_NET_JOIN
    { my_d_button_proc,  45,   80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Host" , NULL, NULL }, //MAIN_DIALOG_NET_HOST
--- 83,87 ----
  DIALOG mainDialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
! //  { d_shadow_box_proc, 40,   40,   180,  285,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { my_d_button_proc,  45,   45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Join" , NULL, NULL }, //MAIN_DIALOG_NET_JOIN
    { my_d_button_proc,  45,   80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Host" , NULL, NULL }, //MAIN_DIALOG_NET_HOST
***************
*** 89,99 ****
    { my_d_button_proc,  45,   150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"SC1 Arena" , NULL, NULL }, //MAIN_DIALOG_SC1ARENA
    { my_d_button_proc,  45,   185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Other game" , NULL, NULL },
!   { my_d_button_proc,  45,   220,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Options", NULL, NULL },
!   { my_d_button_proc,  45,   255,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Help", NULL, NULL },
!   { my_d_button_proc,  45,   290,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
!   { my_d_button_proc,  250,  115,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Edit Fleet", NULL, NULL },
!   { my_d_button_proc,  250,  150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Edit Teams" , NULL, NULL },
!   { my_d_button_proc,  250,  185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Ship Info", NULL, NULL },//MELEE_EX_DIALOG_SHIPINFO
!   { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       1,    0,    NULL, NULL, NULL }
  };
--- 89,99 ----
    { my_d_button_proc,  45,   150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"SC1 Arena" , NULL, NULL }, //MAIN_DIALOG_SC1ARENA
    { my_d_button_proc,  45,   185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Other game" , NULL, NULL },
!   { my_d_button_proc,  250,  45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Edit Fleet", NULL, NULL },
!   { my_d_button_proc,  250,  80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Edit Teams" , NULL, NULL },
!   { my_d_button_proc,  250,  115,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Options", NULL, NULL },
!   { my_d_button_proc,  250,  150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Ship Info", NULL, NULL },//MELEE_EX_DIALOG_SHIPINFO
!   { my_d_button_proc,  250,  185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Help", NULL, NULL },
!   { my_d_button_proc,  150,  220,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
!  { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       1,    0,    NULL, NULL, NULL }
  };
***************
*** 173,176 ****
--- 173,177 ----
  				play_single("Melee");
  				enable();
+ 				showTitle();
  				break;
  
***************
*** 179,182 ****
--- 180,184 ----
  				play_single("SC1 Arena");
  				enable();
+ 				showTitle();
  				break;
  			
***************
*** 186,189 ****
--- 188,192 ----
  				play_net(mainRet == MAIN_DIALOG_NET_HOST);
  				enable();
+ 				showTitle();
  				break;
  
***************
*** 194,197 ****
--- 197,201 ----
  				if (gname) play_single(gname);
  				enable();
+ 				showTitle();
  				break;
  				}
***************
*** 199,206 ****
--- 203,212 ----
  			case MAIN_DIALOG_OPTIONS:
  				options_menu(NULL);
+ 				showTitle();
  				break;
  
  			case MAIN_DIALOG_HELP:
  				show_file("ingame.txt");
+ 				showTitle();
  				break;
  
***************
*** 217,221 ****
--- 223,229 ----
  			case MELEE_EX_DIALOG_SHIPINFO:
  				ship_view_dialog(0, NULL);
+ 				showTitle();
  				break;
+ 
  		}
  	} while((mainRet != MAIN_DIALOG_EXIT) && (mainRet != -1));

[Timewarp-commit] source/melee mcontrol.cpp, 1.32, 1.33 mcontrol.h, 1.14, 1.15 mframe.cpp, 1.51, 1.52 moptions.cpp, 1.20, 1.21 mship.cpp, 1.46, 1.47

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source/melee

Modified Files:
	mcontrol.cpp mcontrol.h mframe.cpp moptions.cpp mship.cpp 
Log Message:


Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** moptions.cpp	2 Jun 2006 08:30:30 -0000	1.20
--- moptions.cpp	2 Jun 2006 13:38:22 -0000	1.21
***************
*** 10,13 ****
--- 10,15 ----
  #include "../scp.h"
  #include "../gui.h"
+ #include "../menu/editkeys.h"
+ #include "../menu/menugeneral.h"
  
  #include "../util/aastr.h"
***************
*** 61,64 ****
--- 63,67 ----
  	DIALOG_OPTIONS_AUDIO,
  	DIALOG_OPTIONS_CONFIG,
+ 	DIALOG_OPTIONS_CONFIGKEYS,
  	DIALOG_OPTIONS_KEYJAMTEST
  	};
***************
*** 70,74 ****
    { my_d_button_proc,  50,   130,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Audio Settings", NULL, NULL },
    { my_d_button_proc,  50,   170,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Game && Rendering", NULL, NULL },
!   { my_d_button_proc,  50,   210,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Keyjam test", NULL, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,    0,     0,    0,    255,  0,    0,    0,       1,    0,    NULL, NULL, NULL }
--- 73,78 ----
    { my_d_button_proc,  50,   130,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Audio Settings", NULL, NULL },
    { my_d_button_proc,  50,   170,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Game && Rendering", NULL, NULL },
!   { my_d_button_proc,  50,   210,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Configure keys", NULL, NULL },
!   { my_d_button_proc,  50,   250,  170,   30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Keyjam test", NULL, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,    0,     0,    0,    255,  0,    0,    0,       1,    0,    NULL, NULL, NULL }
***************
*** 98,101 ****
--- 102,111 ----
  			break;
  
+ 			case DIALOG_OPTIONS_CONFIGKEYS:
+ 				showTitle();
+ 				ControlHuman_setup(0);
+ 				showTitle();
+ 				break;
+ 
  			case DIALOG_OPTIONS_KEYJAMTEST:
  				keyjamming_tester();

Index: mcontrol.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mcontrol.h	23 Aug 2005 22:20:16 -0000	1.14
--- mcontrol.h	2 Jun 2006 13:38:22 -0000	1.15
***************
*** 38,42 ****
    KeyCode keys;
    /*! \brief name of instance */
!   char *iname;
    SpaceObject *target;
    int index;
--- 38,42 ----
    KeyCode keys;
    /*! \brief name of instance */
! //  char *iname;
    SpaceObject *target;
    int index;
***************
*** 70,80 ****
    virtual const char *getTypeName() = 0;
    /*! \brief returns the description of the control, like "NetworkGame(local)_Keyboard0" */
!   virtual char *getDescription();
    /*! \brief the constructor initializes ship to NULL */
    Control (const char *name, int channel) ;
    /*! \brief the destructor, which is rarely used */
    virtual ~Control () ;
-   /*! called by the GUI stuff to setup the controls (calibrate Joystick, set keys, etc.) */
-   virtual void setup();
    virtual void set_target(int i);
    virtual void target_stuff();
--- 70,78 ----
    virtual const char *getTypeName() = 0;
    /*! \brief returns the description of the control, like "NetworkGame(local)_Keyboard0" */
! //  virtual char *getDescription();
    /*! \brief the constructor initializes ship to NULL */
    Control (const char *name, int channel) ;
    /*! \brief the destructor, which is rarely used */
    virtual ~Control () ;
    virtual void set_target(int i);
    virtual void target_stuff();

Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** mship.cpp	29 Jan 2006 16:14:34 -0000	1.46
--- mship.cpp	2 Jun 2006 13:38:22 -0000	1.47
***************
*** 29,33 ****
  #include "mview.h"
  
- #include "ais/ext_ai.h"
  
  /*------------------------------*
--- 29,32 ----

Index: mcontrol.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mcontrol.cpp	2 Jun 2006 08:30:30 -0000	1.32
--- mcontrol.cpp	2 Jun 2006 13:38:22 -0000	1.33
***************
*** 104,108 ****
  	}
  	*/
! void Control::setup() {}
  void Control::select_ship(Ship* ship_pointer, const char* ship_name) {STACKTRACE;
  	ship = ship_pointer;
--- 104,108 ----
  	}
  	*/
! 
  void Control::select_ship(Ship* ship_pointer, const char* ship_name) {STACKTRACE;
  	ship = ship_pointer;
***************
*** 475,481 ****
  	return 0;
  	}
! char *Control::getDescription() {STACKTRACE;
! 	return iname;
! 	}
  void Control::_event(Event *e) {STACKTRACE;
  	//add code for lag increase / decrease here
--- 475,481 ----
  	return 0;
  	}
! //char *Control::getDescription() {STACKTRACE;
! //	return iname;
! //	}
  void Control::_event(Event *e) {STACKTRACE;
  	//add code for lag increase / decrease here
***************
*** 508,512 ****
  		}
  	}
! 	iname = strdup(name);
  
  	auto_update = true;	// for bots.
--- 508,512 ----
  		}
  	}
! //	iname = strdup(name);
  
  	auto_update = true;	// for bots.

Index: mframe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** mframe.cpp	22 Apr 2006 09:24:53 -0000	1.51
--- mframe.cpp	2 Jun 2006 13:38:22 -0000	1.52
***************
*** 17,21 ****
  #include "mcbodies.h"
  
- #include "ais/ext_ai.h"
  
  #include "scp.h"
--- 17,20 ----

[Timewarp-commit] source/ais c_input.cpp,1.20,1.21

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/ais
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source/ais

Modified Files:
	c_input.cpp 
Log Message:


Index: c_input.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** c_input.cpp	10 Aug 2005 21:06:32 -0000	1.20
--- c_input.cpp	2 Jun 2006 13:38:21 -0000	1.21
***************
*** 3,16 ****
   * Star Control - TimeWarp
   *
!  * c_input.cpp - controller input module
!  *
!  * 25-Jun-2002, Revision 1 by The Fly
!  *
!  *
!  * - ControlHuman::setup() function modified. setup_key_description() 
!  * is now redundant due to modifications in key_to_description(). There
!  * was also a duplication of closest target setting.
!  * - JOY dialog structure and function modified. Should work O.K. now.
!  * - Cosmetic code changes.
   */
  
--- 3,7 ----
   * Star Control - TimeWarp
   *
! 
   */
  
***************
*** 27,109 ****
  
  
! #define JOY_DIALOG_BOX          0
! #define JOY_DIALOG_TITLE        1
! #define JOY_DIALOG_CALIBRATE    2
! #define JOY_DIALOG_SWITCH       3
! #define JOY_DIALOG_DONE         4
! #define JOY_DIALOG_DESCRIPTION  5
! 
! DIALOG joyDialog[] = {
!   // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
!   { d_box_proc,        40,   40,   200,  250,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
!   { d_textbox_proc,    50,   50,   180,  30,   255,  0,    0,    0,       0,    0,    (char*)"Joystick Calibration", NULL, NULL },
! 	{ my_d_button_proc,  50,   100,  180,  30,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[0], NULL, NULL },
!   { my_d_button_proc,  50,   140,  100,  30,   255,  0,    0,    D_EXIT,  0,    0,    (char*)"Next Joystick", NULL, NULL },
!   { my_d_button_proc,  160,  140,  70,   30,   255,  0,    0,    D_EXIT,  0,    0,    (char*)"Done", NULL, NULL },
!   { d_textbox_proc,    50,   180,  180,  100,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
!   { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
!   { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
! };
! 
! void calibrate_joysticks() {
! 	int i;
! 	const char *cal;
! 
! 	if (!num_joysticks) {
! 		tw_alert("No joysticks detected", "Done");
! 		return;
! 	}
! 
! 	int which_joystick = 0;
! 	while (true) {
! 		if(poll_joystick() != 0)
! 			return;
! 		if (::joy[which_joystick].flags & JOYFLAG_CALIBRATE) {
! 			cal = calibrate_joystick_name(which_joystick);
! 			if (cal)
! 				sprintf(dialog_string[0], "Calibrate : %s", cal);
! 			else
! 				sprintf(dialog_string[0], "Calibrate : ?");
! 		}	else
! 			sprintf (dialog_string[0], "De-Calibrate");
! 
! 		char buffy[1024];
! 		char *d = buffy;
! 
! 		d += sprintf(d, "Joystick %d\n\n", which_joystick);
! 
! 		for (i = 0; i < ::joy[which_joystick].num_sticks; i += 1) {
! 			d += sprintf(d, "%s %d\n", ::joy[which_joystick].stick[i].name, i);
! 		}
! 
! 		d += sprintf(d, "\nBUTTONS\n");
! 		for (i = 0; i < ::joy[which_joystick].num_buttons; i += 1) {
! 			d += sprintf(d, " %s", ::joy[which_joystick].button[i].name);
! 		}
! 		
! 		joyDialog[JOY_DIALOG_DESCRIPTION].dp = buffy;
! 		i = tw_popup_dialog(NULL,joyDialog, 1);
! 		if (i == -1)
! 			i = JOY_DIALOG_DONE;
! 
! 		switch (i) {
! 			case JOY_DIALOG_SWITCH:
! 				if (num_joysticks)
! 					which_joystick = (which_joystick + 1) % num_joysticks; 
! 			  break;
! 			case JOY_DIALOG_DONE:
! 				return;
! 			case JOY_DIALOG_CALIBRATE:
! 				if (::joy[which_joystick].flags & JOYFLAG_CALIBRATE) {
! 					calibrate_joystick(which_joystick);
! 					save_joystick_data("joys.ini");
! 				} else {
! 					delete_file("joys.ini");
! 					remove_joystick();
! 					install_joystick(JOY_TYPE_AUTODETECT);
! 				}
! 			  break;
! 		}
! 	}
  }
  
--- 18,27 ----
  
  
! void player_key_edit(const char *inisection, const char *id, int *value, KEY_EDIT_OPTION option)
! {
! 	if (option == key_load)
! 		*value = get_config_int(inisection, id, 0);
! 	else
! 		set_config_int(inisection, id, *value);
  }
  
***************
*** 112,161 ****
    \param inisection with players keys 
  */
! void ControlHuman::load (const char *inifile, const char *inisection) {
  	set_config_file (inifile);
- 	thrust      = get_config_int(inisection, "Thrust",      0);
- 	back        = get_config_int(inisection, "Backwards",   0);
- 	left        = get_config_int(inisection, "Left",        0);
- 	right       = get_config_int(inisection, "Right",       0);
- 	fire        = get_config_int(inisection, "Fire",        0);
- 	altfire     = get_config_int(inisection, "AltFire",     0);
- 	special     = get_config_int(inisection, "Special",     0);
- 	next        = get_config_int(inisection, "Next_Target", 0);
- 	prev        = get_config_int(inisection, "Prev_Target", 0);
- 	closest     = get_config_int(inisection, "Closest_Target", 0);
- 	extra1      = get_config_int(inisection, "Extra1", 0);
- 	extra2      = get_config_int(inisection, "Extra2", 0);
- 	communicate = get_config_int(inisection, "Communicate", 0);
- 	dec_lag     = get_config_int(inisection, "DecLag", 0);
- 	inc_lag     = get_config_int(inisection, "IncLag", 0);
- 	suicide     = get_config_int(inisection, "Extra6", 0);
- 	return;
- }
  
! /*! \brief Save players key
!   \param inifile with players keys
!   \param inisection with players keys
!  */
! void ControlHuman::save (const char *inifile, const char *inisection) {
! 	set_config_file (inifile);
! 	set_config_int(inisection, "Thrust",         thrust);
! 	set_config_int(inisection, "Backwards",      back);
! 	set_config_int(inisection, "Left",           left);
! 	set_config_int(inisection, "Right",          right);
! 	set_config_int(inisection, "Fire",           fire);
! 	set_config_int(inisection, "AltFire",        altfire);
! 	set_config_int(inisection, "Special",        special);
! 	set_config_int(inisection, "Next_Target",    next);
! 	set_config_int(inisection, "Prev_Target",    prev);
! 	set_config_int(inisection, "Closest_Target", closest);
! 	set_config_int(inisection, "Extra1", extra1);
! 	set_config_int(inisection, "Extra2", extra2);
! 	set_config_int(inisection, "Communicate", communicate);
! 	set_config_int(inisection, "DecLag", dec_lag);
! 	set_config_int(inisection, "IncLag", inc_lag);
! 	set_config_int(inisection, "Extra6", suicide);
  	return;
  }
  
  /*! \brief Get control name */
  const char *ControlHuman::getTypeName() {
--- 30,58 ----
    \param inisection with players keys 
  */
! void player_keys_load_write (player_keys *userkeys, const char *inifile, const char *inisection, KEY_EDIT_OPTION localoption) {
! 	
  	set_config_file (inifile);
  
! 	player_key_edit(inisection, "Thrust",		&userkeys->thrust, localoption);
! 	player_key_edit(inisection, "Backwards",	&userkeys->back, localoption);
! 	player_key_edit(inisection, "Left",			&userkeys->left, localoption);
! 	player_key_edit(inisection, "Right",		&userkeys->right, localoption);
! 	player_key_edit(inisection, "Fire",			&userkeys->fire, localoption);
! 	player_key_edit(inisection, "AltFire",		&userkeys->altfire, localoption);
! 	player_key_edit(inisection, "Special",		&userkeys->special, localoption);
! 	player_key_edit(inisection, "Next_Target",	&userkeys->next, localoption);
! 	player_key_edit(inisection, "Prev_Target",	&userkeys->prev, localoption);
! 	player_key_edit(inisection, "Closest_Target",	&userkeys->closest, localoption);
! 	player_key_edit(inisection, "Extra1",		&userkeys->extra1, localoption);
! 	player_key_edit(inisection, "Extra2",		&userkeys->extra2, localoption);
! 	player_key_edit(inisection, "Communicate",	&userkeys->communicate, localoption);
! 	player_key_edit(inisection, "DecLag",	&userkeys->dec_lag, localoption);
! 	player_key_edit(inisection, "IncLag",	&userkeys->inc_lag, localoption);
! 	player_key_edit(inisection, "Extra6",	&userkeys->suicide, localoption);
! 
  	return;
  }
  
+ 
  /*! \brief Get control name */
  const char *ControlHuman::getTypeName() {
***************
*** 163,166 ****
--- 60,75 ----
  }
  
+ void ControlHuman::load(const char* inifile, const char* inisection)
+ {
+ 	player_keys_load_write(&userkeys, inifile, inisection, key_load);
+ }
+ 
+ void ControlHuman::save(const char* inifile, const char* inisection)
+ {
+ 	tw_error("should not be used?");
+ 	player_keys_load_write(&userkeys, inifile, inisection, key_write);
+ }
+ 
+ 
  #include "../melee/mview.h"
  /*! \brief Process get input from player */
***************
*** 237,241 ****
  
  	// manual thrust or cruise change
! 	if (key_pressed(thrust))
  	{
  		if (!cruise_control)
--- 146,150 ----
  
  	// manual thrust or cruise change
! 	if (key_pressed(userkeys.thrust))
  	{
  		if (!cruise_control)
***************
*** 261,295 ****
  	}
  
! 	if (key_pressed(back)) r |= keyflag::back;
  	
! 	if (key_pressed(left))
  		r |= keyflag::left;
  	
! 	if (key_pressed(right))
  		r |= keyflag::right;
  
! 	if (key_pressed(fire))
  		r |= keyflag::fire;
  
! 	if (key_pressed(altfire))
  		r |= keyflag::altfire;
  
! 	if (key_pressed(special))
  		r |= keyflag::special;
  
! 	if (key_pressed(next))
  		r |= keyflag::next;
  
! 	if (key_pressed(prev))
  		r |= keyflag::prev;
  
! 	if (key_pressed(closest)) r |= keyflag::closest;
! 	if (key_pressed(extra1)) r |= keyflag::extra1;
! 	if (key_pressed(extra2))
  		r |= keyflag::extra2;
! 	if (key_pressed(communicate)) r |= keyflag::communicate;
! 	if (key_pressed(dec_lag)) r |= keyflag::dec_lag;
! 	if (key_pressed(inc_lag)) r |= keyflag::inc_lag;
! 	if (key_pressed(suicide)) r |= keyflag::suicide;
  	return r;
  }
--- 170,204 ----
  	}
  
! 	if (key_pressed(userkeys.back)) r |= keyflag::back;
  	
! 	if (key_pressed(userkeys.left))
  		r |= keyflag::left;
  	
! 	if (key_pressed(userkeys.right))
  		r |= keyflag::right;
  
! 	if (key_pressed(userkeys.fire))
  		r |= keyflag::fire;
  
! 	if (key_pressed(userkeys.altfire))
  		r |= keyflag::altfire;
  
! 	if (key_pressed(userkeys.special))
  		r |= keyflag::special;
  
! 	if (key_pressed(userkeys.next))
  		r |= keyflag::next;
  
! 	if (key_pressed(userkeys.prev))
  		r |= keyflag::prev;
  
! 	if (key_pressed(userkeys.closest)) r |= keyflag::closest;
! 	if (key_pressed(userkeys.extra1)) r |= keyflag::extra1;
! 	if (key_pressed(userkeys.extra2))
  		r |= keyflag::extra2;
! 	if (key_pressed(userkeys.communicate)) r |= keyflag::communicate;
! 	if (key_pressed(userkeys.dec_lag)) r |= keyflag::dec_lag;
! 	if (key_pressed(userkeys.inc_lag)) r |= keyflag::inc_lag;
! 	if (key_pressed(userkeys.suicide)) r |= keyflag::suicide;
  	return r;
  }
***************
*** 305,445 ****
  }
  
- #define KEY_DIALOG_MODIFY    0
- #define KEY_DIALOG_OK        17
- #define KEY_DIALOG_CANCEL    18
- #define KEY_DIALOG_CALIBRATE 19
- 
- DIALOG keyDialog[] = {
-   // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
-   { d_textbox_proc,    0,    0,    160,  80,   255,  0,    0,    0,       0,    0,    dialog_string[0], NULL, NULL },
-   { my_d_button_proc,  60,   90,   500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[1], NULL, NULL },
-   { my_d_button_proc,  60,   120,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[2], NULL, NULL },
-   { my_d_button_proc,  60,   150,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[3], NULL, NULL },
-   { my_d_button_proc,  60,   180,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[4], NULL, NULL },
-   { my_d_button_proc,  60,   210,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[5], NULL, NULL },
-   { my_d_button_proc,  60,   240,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[6], NULL, NULL },
-   { my_d_button_proc,  60,   270,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[7], NULL, NULL },
-   { my_d_button_proc,  60,   300,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[8], NULL, NULL },
-   { my_d_button_proc,  60,   330,  500,  25,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[9], NULL, NULL },
-   { my_d_button_proc,  60,   360,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[10], NULL, NULL },
-   { my_d_button_proc,  60,   375,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[11], NULL, NULL },
-   { my_d_button_proc,  60,   390,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[12], NULL, NULL },
-   { my_d_button_proc,  60,   405,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[13], NULL, NULL },
-   { my_d_button_proc,  60,   420,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[14], NULL, NULL },
-   { my_d_button_proc,  60,   435,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[15], NULL, NULL },
-   { my_d_button_proc,  60,   450,  500,  15,   255,  0,    0,    D_EXIT,  0,    0,    dialog_string[16], NULL, NULL },
- 
-   { my_d_button_proc,  180,  20,   180,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Accept Changes", NULL, NULL },
-   { d_button_proc,     180,  50,   180,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Cancel", NULL, NULL },
-   { my_d_button_proc,  360,  35,   200,  25,   255,  0,    0,    D_EXIT,  0,    0,    (void*)"Calibrate Joysticks", NULL, NULL },
-   { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
-   { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
- };
- 
- /*! \brief setap players keys */
- void ControlHuman::setup() {
- 	int i, t = 0;
- 	int last = 0;
- 	while (true) {
- 		char *s;
- 		int index = 0;
- 
- 		s = dialog_string[index]; index += 1;
- 
- 		s += sprintf(s, "Set Your Keys\nController %s", getDescription());
- 		s = dialog_string[index]; index += 1;
- 
- 		s += sprintf ( s, "Left:           ");
- 		key_to_description(left, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Right:          ");
- 		key_to_description(right, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Thrust:         ");
- 		key_to_description(thrust, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Backwards:      ");
- 		key_to_description(back, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Fire:           ");
- 		key_to_description(fire, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Special:        ");
- 		key_to_description(special, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "AltFire:        ");
- 		key_to_description(altfire, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Next Target:    ");
- 		key_to_description(next, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Prev Target:    ");
- 		key_to_description(prev, s);
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Closest Target: ");
- 		key_to_description ( closest, s );
- 
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Extra1: ");
- 		key_to_description ( extra1, s );
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Extra2: ");
- 		key_to_description ( extra2, s );
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Communicate: ");
- 		key_to_description ( communicate, s );
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Decrease Lag: ");
- 		key_to_description ( dec_lag, s );
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Increase Lag: ");
- 		key_to_description ( inc_lag, s );
- 		s = dialog_string[index]; index += 1;
- 		s += sprintf ( s, "Suicide: ");
- 		key_to_description ( suicide, s );
- 
- 		s = dialog_string[index]; index += 1;
- 
- 		int maxlen = 0;
- 		for (i = 1; i < KEY_DIALOG_OK; i += 1) {
- 			int t = strlen(dialog_string[i]);
- 			if (maxlen < t) maxlen = t;
- 		}
- 		for (i = 1; i < KEY_DIALOG_OK; i += 1) {
- 			int t = strlen(dialog_string[i]);
- 			dialog_string[i][maxlen] = 0; 
- 			memset(dialog_string[i]+t, ' ', maxlen-t);
- 		}
- 		clear_keybuf();
- 		if (last < KEY_DIALOG_OK) last += 1;
- 		i = tw_do_dialog(NULL, keyDialog, last);
- 		if (i == -1) return;
- 		if (i < KEY_DIALOG_OK) {
- 			t = get_key();
- 			clear_keybuf();
- 		}
- 		if (t == KEY_ESC) i = KEY_DIALOG_CANCEL;
- 		switch (i) {
- 			case 1:  left        = t; break;
- 			case 2:  right       = t; break;
- 			case 3:  thrust      = t; break;
- 			case 4:  back	     = t; break;
- 			case 5:  fire        = t; break;
- 			case 6:  special     = t; break;
- 			case 7:  altfire     = t; break;
- 			case 8:  next        = t; break;
- 			case 9:  prev        = t; break;
- 			case 10: closest     = t; break;
- 			case 11: extra1      = t; break;
- 			case 12: extra2      = t; break;
- 			case 13: communicate = t; break;
- 			case 14: dec_lag     = t; break;
- 			case 15: inc_lag     = t; break;
- 			case 16: suicide     = t; break;
- 			case KEY_DIALOG_OK:  save("scp.ini", getDescription()); return;
- 			case KEY_DIALOG_CANCEL: load("scp.ini", getDescription()); return;
- 			case KEY_DIALOG_CALIBRATE: calibrate_joysticks(); break;
- 		}
- 	}
- 	return;
- }
--- 214,215 ----

[Timewarp-commit] source ais.h,1.14,1.15

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source

Modified Files:
	ais.h 
Log Message:


Index: ais.h
===================================================================
RCS file: /cvsroot/timewarp/source/ais.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ais.h	16 Mar 2006 16:10:32 -0000	1.14
--- ais.h	2 Jun 2006 13:38:21 -0000	1.15
***************
*** 11,25 ****
  const int MAX_OPTIONS  = 1024;
  
! 
! //ais/c_input.cpp
! /*! \brief Human Ship Control */
! class ControlHuman : public Control
! {	
! 	private:
! 	bool toggle_cruise_thrust_press;
! 
  	int thrust;
- 	bool cruise_control_thrust;
- 
  	int left;
  	int right;
--- 11,17 ----
  const int MAX_OPTIONS  = 1024;
  
! struct player_keys
! {
  	int thrust;
  	int left;
  	int right;
***************
*** 33,36 ****
--- 25,45 ----
  	int extra1, extra2, communicate, dec_lag, inc_lag;
  	int suicide;
+ };
+ 
+ typedef enum {key_load=1, key_write} KEY_EDIT_OPTION;
+ void player_keys_load_write (player_keys *keys, const char *inifile, const char *inisection, KEY_EDIT_OPTION localoption);
+ 
+ 
+ //ais/c_input.cpp
+ /*! \brief Human Ship Control */
+ class ControlHuman : public Control
+ {	
+ 	private:
+ 	bool toggle_cruise_thrust_press;
+ 
+ 	bool cruise_control_thrust;
+ 
+ 	player_keys userkeys;
+ 
  	public:
  	virtual void load(const char* inifile, const char* inisection);
***************
*** 39,43 ****
  	virtual int think();
  	ControlHuman (const char *name, int channel) ;
- 	virtual void setup();
  	};
  
--- 48,51 ----

[Timewarp-commit] source/games gmissions.cpp,1.31,1.32

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752/source/games

Modified Files:
	gmissions.cpp 
Log Message:


Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** gmissions.cpp	2 Jun 2006 08:02:55 -0000	1.31
--- gmissions.cpp	2 Jun 2006 13:38:21 -0000	1.32
***************
*** 27,31 ****
  #include "gmissions_objects.h"
  
! #include "gplexplr.h"
  
  #include <string.h>
--- 27,31 ----
  #include "gmissions_objects.h"
  
! //#include "gplexplr.h"
  
  #include <string.h>

[Timewarp-commit] client.ini, 1.35, 1.36 fleets.ini, 1.85, 1.86 scp.ini, 1.41, 1.42 server.ini, 1.12, 1.13 twwin.dsp, 1.56, 1.57

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31752

Modified Files:
	client.ini fleets.ini scp.ini server.ini twwin.dsp 
Log Message:


Index: scp.ini
===================================================================
RCS file: /cvsroot/timewarp/scp.ini,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** scp.ini	11 Jul 2005 00:25:01 -0000	1.41
--- scp.ini	2 Jun 2006 13:38:21 -0000	1.42
***************
*** 6,12 ****
  
  [Config0]
! Thrust = 84
! Left = 82
! Right = 83
  Fire = 67
  AltFire = 63
--- 6,12 ----
  
  [Config0]
! Thrust = 23
! Left = 1
! Right = 4
  Fire = 67
  AltFire = 63
***************
*** 15,20 ****
  Prev_Target = 66
  Closest_Target = 16
  
! Backwards = 39
  Extra1 = 72
  Extra2 = 73
--- 15,22 ----
  Prev_Target = 66
  Closest_Target = 16
+ DecLag = 0
+ IncLag = 0
  
! Backwards = 19
  Extra1 = 72
  Extra2 = 73
***************
*** 28,35 ****
  
  [Config1]
! Backwards = 19
! Thrust = 23
! Left = 1
! Right = 4
  Fire = 103
  AltFire = 14
--- 30,37 ----
  
  [Config1]
! Backwards = 85
! Thrust = 84
! Left = 82
! Right = 83
  Fire = 103
  AltFire = 14
***************
*** 45,48 ****
--- 47,52 ----
  Extra6 = 0
  Communicate = 0
+ DecLag = 0
+ IncLag = 0
  
  

Index: client.ini
===================================================================
RCS file: /cvsroot/timewarp/client.ini,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** client.ini	11 Jul 2005 00:25:00 -0000	1.35
--- client.ini	2 Jun 2006 13:38:21 -0000	1.36
***************
*** 21,25 ****
  ;valid = values are 8 (ugly), 15, 16, 24 (slow), and 32
  
! FullScreen = 2
  ; = 0 = windowed, 1 = fullscreen
  
--- 21,25 ----
  ;valid = values are 8 (ugly), 15, 16, 24 (slow), and 32
  
! FullScreen = 0
  ; = 0 = windowed, 1 = fullscreen
  
***************
*** 32,36 ****
  
  SoundOn = 2
! MusicOn = 2
  SoundVolume = 138
  MusicVolume = 137
--- 32,36 ----
  
  SoundOn = 2
! MusicOn = 0
  SoundVolume = 138
  MusicVolume = 137

Index: twwin.dsp
===================================================================
RCS file: /cvsroot/timewarp/twwin.dsp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** twwin.dsp	2 Jun 2006 08:17:07 -0000	1.56
--- twwin.dsp	2 Jun 2006 13:38:21 -0000	1.57
***************
*** 278,289 ****
  # Begin Source File
  
- SOURCE=.\source\other\luaport.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\other\luaport.h
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\other\nullphas.cpp
  # End Source File
--- 278,281 ----
***************
*** 601,608 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpbahbu.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpbatde.cpp
  # End Source File
--- 593,596 ----
***************
*** 637,652 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpconho.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpcrapl.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\source\newships\shpcresu.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpcrore.cpp
  # End Source File
--- 625,632 ----
***************
*** 677,684 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpearc2.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpearc3.cpp
  # End Source File
--- 657,660 ----
***************
*** 709,720 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpgerhe.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\newships\shpgerra.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpglacr.cpp
  # End Source File
--- 685,688 ----
***************
*** 769,776 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpkoaja.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpkoapa.cpp
  # End Source File
--- 737,740 ----
***************
*** 825,832 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpostdi.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpplala.cpp
  # End Source File
--- 789,792 ----
***************
*** 849,860 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpradfi.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\newships\shprekas.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shprogsq.cpp
  # End Source File
--- 809,812 ----
***************
*** 917,956 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shptelno.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpterbi.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\source\newships\shptougr.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\newships\shptrige.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\newships\shptulra.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpulzin.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\source\newships\shpuosli.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpuxjba.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\source\newships\shpvenke.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpvezba.cpp
  # End Source File
--- 869,884 ----
***************
*** 961,968 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpvirli.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpvuvji.cpp
  # End Source File
--- 889,892 ----
***************
*** 977,996 ****
  # Begin Source File
  
- SOURCE=.\source\newships\shpxaaar.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\source\newships\shpxilcr.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpxxxma.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\source\newships\shpyevme.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\source\newships\shpyurpa.cpp
  # End Source File
--- 901,908 ----
***************
*** 1174,1177 ****
--- 1086,1097 ----
  # Begin Source File
  
+ SOURCE=.\source\menu\editkeys.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\source\menu\editkeys.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\source\menu\editteams.cpp
  # End Source File

Index: fleets.ini
===================================================================
RCS file: /cvsroot/timewarp/fleets.ini,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** fleets.ini	11 Jul 2005 00:25:00 -0000	1.85
--- fleets.ini	2 Jun 2006 13:38:21 -0000	1.86
***************
*** 1,84 ****
  [Player1]
! Slot0 = andgu
! Slot1 = arisk
! Slot2 = chebr
! Slot3 = earcr
! Size = 88
  MaxFleetCost = 10000
! Slot4 = ilwav
! Slot5 = kzedr
! Slot6 = mmrxf
! Slot7 = mycpo
! Slot8 = shosc
! Slot9 = spael
! Slot10 = syrpe
! Slot11 = umgdr
! Slot12 = vuxin
! Slot13 = yehte
! Slot14 = chmav
! Slot15 = druma
! Slot16 = kohma
! Slot17 = meltr
! Slot18 = orzne
! Slot19 = pkufu
! Slot20 = slypr
! Slot21 = supbl
! Slot22 = thrto
! Slot23 = utwju
! Slot24 = zfpst
! Slot25 = clapi
! Slot26 = dakvi
! Slot27 = dooco
! Slot28 = exqen
! Slot29 = harra
! Slot30 = herex
! Slot31 = ktacr
! Slot32 = lk_sa
! Slot33 = owavo
! Slot34 = plopl
! Slot35 = vyrin
! Slot36 = xchex
! Slot37 = alckr
! Slot38 = artem
! Slot39 = astba
! Slot40 = batde
! Slot41 = bipka
! Slot42 = bubex
! Slot43 = choex
! Slot44 = clofl
! Slot45 = conca
! Slot46 = crore
! Slot47 = dajem
! Slot48 = djila
! Slot49 = dragr
! Slot50 = earc2
! Slot51 = estgu
  Slot52 = fiear
  Slot53 = forsh
! Slot54 = geror
! Slot55 = glads
! Slot56 = hotsp
! Slot57 = hubde
! Slot58 = hydcr
! Slot59 = ilwsp
! Slot60 = impka
! Slot61 = jnkla
! Slot62 = jygst
! Slot63 = kahbo
! Slot64 = montr
! Slot65 = neodr
! Slot66 = nisha
! Slot67 = ostdi
! Slot68 = plala
! Slot69 = quasi
! Slot70 = quawr
! Slot71 = rogsq
! Slot72 = sefn2
! Slot73 = strsc
! Slot74 = tauar
! Slot75 = tauda
! Slot76 = tauem
! Slot77 = taugl
! Slot78 = tauhu
  Slot79 = taule
  Slot80 = taumc
--- 1,84 ----
  [Player1]
! Slot0 = tauhu
! Slot1 = andgu
! Slot2 = arisk
! Slot3 = chebr
! Size = 79
  MaxFleetCost = 10000
! Slot4 = earcr
! Slot5 = ilwav
! Slot6 = kzedr
! Slot7 = mmrxf
! Slot8 = mycpo
! Slot9 = shosc
! Slot10 = spael
! Slot11 = syrpe
! Slot12 = umgdr
! Slot13 = vuxin
! Slot14 = yehte
! Slot15 = chmav
! Slot16 = druma
! Slot17 = kohma
! Slot18 = meltr
! Slot19 = orzne
! Slot20 = pkufu
! Slot21 = slypr
! Slot22 = supbl
! Slot23 = thrto
! Slot24 = utwju
! Slot25 = zfpst
! Slot26 = clapi
! Slot27 = dakvi
! Slot28 = dooco
! Slot29 = exqen
! Slot30 = harra
! Slot31 = herex
! Slot32 = ktacr
! Slot33 = lk_sa
! Slot34 = owavo
! Slot35 = plopl
! Slot36 = vyrin
! Slot37 = xchex
! Slot38 = alckr
! Slot39 = artem
! Slot40 = astba
! Slot41 = batde
! Slot42 = bipka
! Slot43 = bipka
! Slot44 = bubex
! Slot45 = choex
! Slot46 = clofl
! Slot47 = conca
! Slot48 = crore
! Slot49 = dajem
! Slot50 = djila
! Slot51 = dragr
  Slot52 = fiear
  Slot53 = forsh
! Slot54 = glads
! Slot55 = hotsp
! Slot56 = hubde
! Slot57 = hydcr
! Slot58 = ilwsp
! Slot59 = impka
! Slot60 = jygst
! Slot61 = montr
! Slot62 = neodr
! Slot63 = nisha
! Slot64 = plala
! Slot65 = quasi
! Slot66 = quawr
! Slot67 = rogsq
! Slot68 = tauar
! Slot69 = tauem
! Slot70 = taugl
! Slot71 = taule
! Slot72 = taumc
! Slot73 = taust
! Slot74 = ulzin
! Slot75 = wassu
! Slot76 = wistr
! Slot77 = xxxma
! Slot78 = yusra
  Slot79 = taule
  Slot80 = taumc
***************
*** 171,254 ****
  
  [Player2]
! Slot0 = andgu
! Slot1 = arisk
! Size = 88
  MaxFleetCost = 10000
! Slot2 = chebr
! Slot3 = earcr
! Slot4 = ilwav
! Slot5 = kzedr
! Slot6 = mmrxf
! Slot7 = mycpo
! Slot8 = shosc
! Slot9 = spael
! Slot10 = syrpe
! Slot11 = umgdr
! Slot12 = vuxin
! Slot13 = yehte
! Slot14 = chmav
! Slot15 = druma
! Slot16 = kohma
! Slot17 = meltr
! Slot18 = orzne
! Slot19 = pkufu
! Slot20 = slypr
! Slot21 = supbl
! Slot22 = thrto
! Slot23 = utwju
! Slot24 = zfpst
! Slot25 = clapi
! Slot26 = dakvi
! Slot27 = dooco
! Slot28 = exqen
! Slot29 = harra
! Slot30 = herex
! Slot31 = ktacr
! Slot32 = lk_sa
! Slot33 = owavo
! Slot34 = plopl
! Slot35 = vyrin
! Slot36 = xchex
! Slot37 = alckr
! Slot38 = artem
! Slot39 = astba
! Slot40 = batde
! Slot41 = bipka
! Slot42 = bubex
! Slot43 = choex
! Slot44 = clofl
! Slot45 = conca
! Slot46 = crore
! Slot47 = dajem
! Slot48 = djila
! Slot49 = dragr
! Slot50 = earc2
! Slot51 = estgu
! Slot52 = fiear
! Slot53 = forsh
! Slot54 = geror
! Slot55 = glads
! Slot56 = hotsp
! Slot57 = hubde
! Slot58 = hydcr
! Slot59 = ilwsp
! Slot60 = impka
! Slot61 = jnkla
! Slot62 = jygst
! Slot63 = kahbo
! Slot64 = montr
! Slot65 = neodr
! Slot66 = nisha
! Slot67 = ostdi
! Slot68 = plala
! Slot69 = quasi
! Slot70 = quawr
! Slot71 = rogsq
! Slot72 = sefn2
! Slot73 = strsc
! Slot74 = tauar
! Slot75 = tauda
! Slot76 = tauem
! Slot77 = taugl
  Slot78 = tauhu
  Slot79 = taule
--- 171,254 ----
  
  [Player2]
! Slot0 = tauhu
! Slot1 = andgu
! Size = 78
  MaxFleetCost = 10000
! Slot2 = arisk
! Slot3 = chebr
! Slot4 = earcr
! Slot5 = ilwav
! Slot6 = kzedr
! Slot7 = mmrxf
! Slot8 = mycpo
! Slot9 = shosc
! Slot10 = spael
! Slot11 = syrpe
! Slot12 = umgdr
! Slot13 = vuxin
! Slot14 = yehte
! Slot15 = chmav
! Slot16 = druma
! Slot17 = kohma
! Slot18 = meltr
! Slot19 = orzne
! Slot20 = pkufu
! Slot21 = slypr
! Slot22 = supbl
! Slot23 = thrto
! Slot24 = utwju
! Slot25 = zfpst
! Slot26 = clapi
! Slot27 = dakvi
! Slot28 = dooco
! Slot29 = exqen
! Slot30 = harra
! Slot31 = herex
! Slot32 = ktacr
! Slot33 = lk_sa
! Slot34 = owavo
! Slot35 = plopl
! Slot36 = vyrin
! Slot37 = xchex
! Slot38 = alckr
! Slot39 = artem
! Slot40 = astba
! Slot41 = batde
! Slot42 = bipka
! Slot43 = bubex
! Slot44 = choex
! Slot45 = clofl
! Slot46 = conca
! Slot47 = crore
! Slot48 = dajem
! Slot49 = djila
! Slot50 = dragr
! Slot51 = fiear
! Slot52 = forsh
! Slot53 = glads
! Slot54 = hotsp
! Slot55 = hubde
! Slot56 = hydcr
! Slot57 = ilwsp
! Slot58 = impka
! Slot59 = jygst
! Slot60 = montr
! Slot61 = neodr
! Slot62 = nisha
! Slot63 = plala
! Slot64 = quasi
! Slot65 = quawr
! Slot66 = rogsq
! Slot67 = tauar
! Slot68 = tauem
! Slot69 = taugl
! Slot70 = taule
! Slot71 = taumc
! Slot72 = taust
! Slot73 = ulzin
! Slot74 = wassu
! Slot75 = wistr
! Slot76 = xxxma
! Slot77 = yusra
  Slot78 = tauhu
  Slot79 = taule

Index: server.ini
===================================================================
RCS file: /cvsroot/timewarp/server.ini,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** server.ini	11 Jul 2005 00:25:01 -0000	1.12
--- server.ini	2 Jun 2006 13:38:21 -0000	1.13
***************
*** 28,31 ****
--- 28,32 ----
  CameraHidesCloakers = 1
  ;ServerSideStars = 1 //not yet implemented
+ ShowRedCloaker = 1
  
  [Stars]

[Timewarp-commit] gflmelee.ini,1.12,1.13

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24030

Modified Files:
	gflmelee.ini 
Log Message:


Index: gflmelee.ini
===================================================================
RCS file: /cvsroot/timewarp/gflmelee.ini,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gflmelee.ini	20 Jul 2005 12:48:56 -0000	1.12
--- gflmelee.ini	2 Jun 2006 13:20:17 -0000	1.13
***************
*** 23,27 ****
  [FleetInit]
  
! Nalliances = 21
  
  PlayerAlliance = 1
--- 23,27 ----
  [FleetInit]
  
! Nalliances = 19
  
  PlayerAlliance = 1
***************
*** 69,73 ****
  ship04 = supbl
  ship05 = pkufu
! ship06 = earc2
  ship07 = thrto
  
--- 69,73 ----
  ship04 = supbl
  ship05 = pkufu
! ship06 = chmav
  ship07 = thrto
  
***************
*** 91,95 ****
  ship04 = alckr
  ship05 = jygst
! ship06 = kahbo
  ship07 = forsh
  
--- 91,95 ----
  ship04 = alckr
  ship05 = jygst
! ship06 = frebo
  ship07 = forsh
  
***************
*** 97,107 ****
  Name = The Tau Collective
  Nships = 7
! ship01 = taubo
  ship02 = tauhu
! ship03 = taule
  ship04 = taume
  ship05 = taust
  ship06 = tautu
! ship07 = jnkla
  
  [Alliance08]
--- 97,107 ----
  Name = The Tau Collective
  Nships = 7
! ship01 = alabo
  ship02 = tauhu
! ship03 = taufi
  ship04 = taume
  ship05 = taust
  ship06 = tautu
! ship07 = chmba
  
  [Alliance08]
***************
*** 112,116 ****
  ship03 = dajem
  ship04 = dyzha
! ship05 = chmav
  ship06 = hydcr
  ship07 = koapa
--- 112,116 ----
  ship03 = dajem
  ship04 = dyzha
! ship05 = earc3
  ship06 = hydcr
  ship07 = koapa
***************
*** 123,140 ****
  ship03 = bubbo
  ship04 = sclfr
! ship05 = velcr
  ship06 = vezba
! ship07 = phepa
  
  [Alliance10]
  Name = The Gemini Constellation Treaty Organization
  Nships = 7
! ship01 = virli
  ship02 = nisha
! ship03 = narlu
! ship04 = estgu
! ship05 = forsh
  ship06 = fiear
! ship07 = trige
  
  [Alliance11]
--- 123,140 ----
  ship03 = bubbo
  ship04 = sclfr
! ship05 = utwde
  ship06 = vezba
! ship07 = kolfl
  
  [Alliance10]
  Name = The Gemini Constellation Treaty Organization
  Nships = 7
! ship01 = gahmo
  ship02 = nisha
! ship03 = artem
! ship04 = strgu
! ship05 = djila
  ship06 = fiear
! ship07 = quasi
  
  [Alliance11]
***************
*** 142,151 ****
  Nships = 7
  ship01 = glads
! ship02 = strsc
  ship03 = katpo
  ship04 = ktesa
! ship05 = montr
  ship06 = yusra
! ship07 = bubbo
  
  [Alliance12]
--- 142,151 ----
  Nships = 7
  ship01 = glads
! ship02 = vioge
  ship03 = katpo
  ship04 = ktesa
! ship05 = ilwsp
  ship06 = yusra
! ship07 = fresc
  
  [Alliance12]
***************
*** 153,162 ****
  Nships = 7
  ship01 = impka
! ship02 = rekas
  ship03 = conca
  ship04 = quawr
  ship05 = garty
! ship06 = conho
! ship07 = tulra
  
  
--- 153,162 ----
  Nships = 7
  ship01 = impka
! ship02 = taugl
  ship03 = conca
  ship04 = quawr
  ship05 = garty
! ship06 = tausl
! ship07 = neodr
  
  
***************
*** 165,169 ****
  Nships = 7
  ship01 = batde
! ship02 = gerhe
  ship03 = hotsp
  ship04 = wistr
--- 165,169 ----
  Nships = 7
  ship01 = batde
! ship02 = leimu
  ship03 = hotsp
  ship04 = wistr
***************
*** 178,191 ****
  ship02 = ducla
  ship03 = taule
! ship04 = yevme
  ship05 = wassu
  ship06 = raame
! ship07 = sefn2
  
  [Alliance15]
  Name = Cooperation of Dimensional Explorers
! Nships = 8
  ship01 = orzne
! ship02 = ostdi
  ship03 = arisk
  ship04 = herex
--- 178,191 ----
  ship02 = ducla
  ship03 = taule
! ship04 = deees
  ship05 = wassu
  ship06 = raame
! ship07 = sefna
  
  [Alliance15]
  Name = Cooperation of Dimensional Explorers
! Nships = 7
  ship01 = orzne
! ship02 = aritr
  ship03 = arisk
  ship04 = herex
***************
*** 193,207 ****
  ship06 = raame
  ship07 = tauhu
- ship08 = aritr
  
  [Alliance16]
  Name = The Hordes of Auriga
  Nships = 7
! ship01 = xilcr
! ship02 = klidr
  ship03 = hubde
  ship04 = tauar
  ship05 = oliha
! ship06 = xaaar
  ship07 = mekpi
  
--- 193,206 ----
  ship06 = raame
  ship07 = tauhu
  
  [Alliance16]
  Name = The Hordes of Auriga
  Nships = 7
! ship01 = yurpa
! ship02 = scain
  ship03 = hubde
  ship04 = tauar
  ship05 = oliha
! ship06 = fweav
  ship07 = mekpi
  
***************
*** 209,257 ****
  Name = The Ophiuchi Tribes
  Nships = 7
! ship01 = venke
  ship02 = moisp
  ship03 = fopsl
  ship04 = uxjba
  ship05 = clofl
! ship06 = uosli
  ship07 = tauem
  
  [Alliance18]
! Name = The Democrats
  Nships = 7
! ship01 = telno
! ship02 = tauda
! ship03 = earc2
! ship04 = tougr
! ship05 = vioge
! ship06 = fresc
! ship07 = quasi
  
- [Alliance19]
- Name = The Kingdom of PanCoh MCMXVI
- Nships = 7
- ship01 = koaja
- ship02 = artem
- ship03 = gahmo
- ship04 = kolfl
- ship05 = panav
- ship06 = earc3
- ship07 = radfi
  
! [Alliance20]
! Name = The Empire of Ayron
! Nships = 7
  ship01 = ayrbs
! ship02 = yurpa
! ship03 = leimu
! ship04 = neccr
! ship05 = neodr
! ship06 = ulzin
! ship07 = taugl
  
- [Alliance21]
- Name = The Disciples of the Exiled Goddess
- Nships = 2
- ship01 = alabc
- ship02 = taumc
  
--- 208,239 ----
  Name = The Ophiuchi Tribes
  Nships = 7
! ship01 = tauto
  ship02 = moisp
  ship03 = fopsl
  ship04 = uxjba
  ship05 = clofl
! ship06 = gluse
  ship07 = tauem
  
  [Alliance18]
! Name = The Democrats of Ayron
  Nships = 7
! ship01 = ostor
! ship02 = sacda
! ship03 = aktgu
! ship04 = astba
! ship05 = crore
! ship06 = taumc
! ship07 = vuvji
  
  
! [Alliance19]
! Name = Disciples of the Exiled Goddess
! Nships = 5
  ship01 = ayrbs
! ship02 = bogce
! ship03 = choex
! ship04 = alabc
! ship05 = ulzin