--- a/docs/html/Makefile.am	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/Makefile.am	Sun Jun 10 19:31:57 2001 +0000
@@ -20,6 +20,7 @@
     guidetimeexamples.html \
     guidevideo.html \
     guidevideoexamples.html \
+    guidevideoopengl.html \
     index.html \
     joystick.html \
     reference.html \

--- a/docs/html/audio.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/audio.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Audio</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/cdrom.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/cdrom.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >CD-ROM</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/event.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/event.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Events</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -85,7 +85,7 @@
 ></DT
 ><DT
 ><A
-HREF="event.html#AEN3194"
+HREF="event.html#AEN3269"
 >Introduction</A
 ></DT
 ><DT
@@ -105,7 +105,7 @@
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3194"
+NAME="AEN3269"
 >Introduction</A
 ></H1
 ><P

--- a/docs/html/eventfunctions.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/eventfunctions.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Event Functions.</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/eventstructures.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/eventstructures.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >SDL Event Structures.</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/general.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/general.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >General</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/guide.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guide.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >SDL Guide</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/guideaboutsdldoc.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideaboutsdldoc.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >About SDLdoc</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -74,9 +74,9 @@
 >About SDLdoc</A
 ></H1
 ><P
->SDLdoc (The SDL Documentation Project) was formed to completely rewrite the SDL documentation and to keep it continually up to date. The team consists completely of volunteers ranging from proplr working with SDL in their spare time to people who use SDL in their everyday working lives.</P
+>SDLdoc (The SDL Documentation Project) was formed to completely rewrite the SDL documentation and to keep it continually up to date. The team consists completely of volunteers ranging from people working with SDL in their spare time to people who use SDL in their everyday working lives.</P
 ><P
->The latest version of this documentation can always be found at the project homepage: http://sdldoc.sourceforge.net.</P
+>The latest version of this documentation can always be found here: http://sdldoc.csn.ul.ie  Downloadable PS, man pages and html tarballs are available at http://sdldoc.csn.ul.ie/pub/</P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"

--- a/docs/html/guideaudioexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideaudioexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Audio Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -80,7 +80,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN343"
+NAME="AEN382"
 >Opening the audio device</A
 ></H2
 ><P
@@ -110,7 +110,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN347"
+NAME="AEN386"
 >Playing audio</A
 ></H2
 ><P

--- a/docs/html/guidebasicsinit.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidebasicsinit.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Initializing SDL</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -133,7 +133,15 @@
 CLASS="FUNCTION"
 >SDL_GetError</TT
 >. Use this often, you can never know too much about an error.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN60"
+></A
 ><P
+><B
+>Example 1-1. Initializing SDL</B
+></P
 ><PRE
 CLASS="PROGRAMLISTING"
 >#include "SDL.h"   /* All SDL App's need this */
@@ -160,7 +168,7 @@
 
     exit(0);
 }&#13;</PRE
-></P
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"

--- a/docs/html/guidecdromexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidecdromexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >CDROM Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -80,7 +80,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN354"
+NAME="AEN393"
 >Listing CD-ROM drives</A
 ></H2
 ><P
@@ -107,7 +107,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN358"
+NAME="AEN397"
 >Opening the default drive</A
 ></H2
 ><P
@@ -156,7 +156,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN362"
+NAME="AEN401"
 >Listing the tracks on a CD</A
 ></H2
 ><P
@@ -182,7 +182,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN366"
+NAME="AEN405"
 >Play an entire CD</A
 ></H2
 ><P

--- a/docs/html/guidecredits.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidecredits.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Credits</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -81,10 +81,18 @@
 ><TBODY
 ><TR
 ><TD
+>Sam Lantinga, slouken@libsdl.org</TD
+></TR
+><TR
+><TD
 >Martin Donlon, akawaka@skynet.ie</TD
 ></TR
 ><TR
 ><TD
+>Mattias Engdegård</TD
+></TR
+><TR
+><TD
 >Julian Peterson</TD
 ></TR
 ><TR

--- a/docs/html/guideeventexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideeventexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Event Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -13,8 +13,8 @@
 TITLE="Examples"
 HREF="guideexamples.html"><LINK
 REL="PREVIOUS"
-TITLE="Video Examples"
-HREF="guidevideoexamples.html"><LINK
+TITLE="Examples"
+HREF="guideexamples.html"><LINK
 REL="NEXT"
 TITLE="Audio Examples"
 HREF="guideaudioexamples.html"></HEAD
@@ -44,7 +44,7 @@
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="guidevideoexamples.html"
+HREF="guideexamples.html"
 >Prev</A
 ></TD
 ><TD
@@ -80,7 +80,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN336"
+NAME="AEN375"
 >Filtering and Handling Events</A
 ></H2
 ><P
@@ -192,7 +192,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="guidevideoexamples.html"
+HREF="guideexamples.html"
 >Prev</A
 ></TD
 ><TD
@@ -217,7 +217,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Video Examples</TD
+>Examples</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"

--- a/docs/html/guideexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -16,8 +16,8 @@
 TITLE="Handling the Keyboard"
 HREF="guideinputkeyboard.html"><LINK
 REL="NEXT"
-TITLE="Video Examples"
-HREF="guidevideoexamples.html"></HEAD
+TITLE="Event Examples"
+HREF="guideeventexamples.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFF8DC"
@@ -57,7 +57,7 @@
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="guidevideoexamples.html"
+HREF="guideeventexamples.html"
 >Next</A
 ></TD
 ></TR
@@ -81,16 +81,11 @@
 ></DT
 ><DT
 ><A
-HREF="guideexamples.html#AEN297"
+HREF="guideexamples.html#AEN369"
 >Introduction</A
 ></DT
 ><DT
 ><A
-HREF="guidevideoexamples.html"
->Video Examples</A
-></DT
-><DT
-><A
 HREF="guideeventexamples.html"
 >Event Examples</A
 ></DT
@@ -116,11 +111,11 @@
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN297"
+NAME="AEN369"
 >Introduction</A
 ></H1
 ><P
->For the moment these examples are taken directly from the old SDL documentation.</P
+>For the moment these examples are taken directly from the old SDL documentation. By the 1.2 release these examples should hopefully deal with most common SDL programming problems.</P
 ></DIV
 ></DIV
 ><DIV
@@ -154,7 +149,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="guidevideoexamples.html"
+HREF="guideeventexamples.html"
 >Next</A
 ></TD
 ></TR
@@ -176,10 +171,10 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Video Examples</TD
+>Event Examples</TD
 ></TR
 ></TABLE
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

--- a/docs/html/guideinput.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideinput.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Input handling</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -13,8 +13,8 @@
 TITLE="SDL Guide"
 HREF="guide.html"><LINK
 REL="PREVIOUS"
-TITLE="Graphics and Video"
-HREF="guidevideo.html"><LINK
+TITLE="Using OpenGL With SDL"
+HREF="guidevideoopengl.html"><LINK
 REL="NEXT"
 TITLE="Handling the Keyboard"
 HREF="guideinputkeyboard.html"></HEAD
@@ -44,7 +44,7 @@
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="guidevideo.html"
+HREF="guidevideoopengl.html"
 >Prev</A
 ></TD
 ><TD
@@ -104,7 +104,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN94"
+NAME="AEN135"
 >Initialization</A
 ></H2
 ><P
@@ -117,23 +117,33 @@
 CLASS="FUNCTION"
 >SDL_Init</TT
 ></A
->.  The joystick flag will usually be used in conjunction with other flags (like the video flag) because the joystick is usually used to control something.
-<PRE
+>.  The joystick flag will usually be used in conjunction with other flags (like the video flag) because the joystick is usually used to control something.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN141"
+></A
+><P
+><B
+>Example 3-1. Initializing SDL with Joystick Support</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
->    if ( ! SDL_Init( SDL_INIT_VIDEO | SDL_INIT_JOYSTICK ) )
+>    if (SDL_Init( SDL_INIT_VIDEO | SDL_INIT_JOYSTICK ) &#60; 0)
     {
         fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
         exit(1);
     }</PRE
->
-This will attempt to start SDL with both the video and the joystick subsystems activated.</P
+></DIV
+><P
+>This will attempt to start SDL with both the video and the joystick subsystems activated.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN101"
+NAME="AEN145"
 >Querying</A
 ></H2
 ><P
@@ -154,8 +164,17 @@
 >.  The joystick is specified by an index where 0 is the first joystick and the last joystick is the number returned by <TT
 CLASS="FUNCTION"
 >SDL_NumJoysticks</TT
-> - 1.  In the demonstration a list of all available joysticks is printed to stdout.  
-<PRE
+> - 1.  In the demonstration a list of all available joysticks is printed to stdout.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN154"
+></A
+><P
+><B
+>Example 3-2. Querying the Number of Available Joysticks</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    printf("%i joysticks were found.\n\n", SDL_NumJoysticks() );
     printf("The names of the joysticks are:\n");
@@ -164,14 +183,14 @@
     {
         printf("    %s\n", SDL_JoystickName(i));
     }</PRE
-></P
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN111"
+NAME="AEN157"
 >Opening a Joystick and Receiving Joystick Events</A
 ></H2
 ><P
@@ -250,15 +269,25 @@
 CLASS="FUNCTION"
 >SDL_JoystickOpen</TT
 ></A
-> function. For the example we are only interested in events from the first joystick on the system, regardless of what it may be. To receive events from it we would do this:
-<PRE
+> function. For the example we are only interested in events from the first joystick on the system, regardless of what it may be. To receive events from it we would do this:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN183"
+></A
+><P
+><B
+>Example 3-3. Opening a Joystick</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    SDL_Joystick *joystick;
 
     SDL_JoystickEventState(SDL_ENABLE);
     joystick = SDL_JoystickOpen(0);</PRE
->
-If we wanted to receive events for other joysticks we would open them with calls to <TT
+></DIV
+><P
+>If we wanted to receive events for other joysticks we would open them with calls to <TT
 CLASS="FUNCTION"
 >SDL_JoystickOpen</TT
 > just like we opened joystick 0, except we would store the <SPAN
@@ -269,7 +298,7 @@
 >Up to this point all the code we have is used just to initialize the joysticks in order to read values at run time. All we need now is an event loop, which is something that all SDL programs should have anyway to receive the systems quit events. We must now add code to check the event loop for at least some of the above mentioned events. Let's assume our event loop looks like this:
 <PRE
 CLASS="PROGRAMLISTING"
->    SDL_Event *event;
+>    SDL_Event event;
     /* Other initializtion code goes here */   
 
     /* Start main game loop here */
@@ -291,8 +320,17 @@
 
     /* End loop here */</PRE
 >
-To handle Joystick events we merely add cases for them, first we'll add axis handling code. Axis checks can get kinda of tricky because alot of the joystick events received are junk. Joystick axis have a tendency to vary just a little between polling due to the way they are designed. To compensate for this you have to set a threshold for changes and ignore the events that have'nt exceeded the threshold. 10% is usually a good threshold value.  This sounds a lot more complicated than it is. Here is the Axis event handler:
-<PRE
+To handle Joystick events we merely add cases for them, first we'll add axis handling code. Axis checks can get kinda of tricky because alot of the joystick events received are junk. Joystick axis have a tendency to vary just a little between polling due to the way they are designed. To compensate for this you have to set a threshold for changes and ignore the events that have'nt exceeded the threshold. 10% is usually a good threshold value.  This sounds a lot more complicated than it is. Here is the Axis event handler:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN191"
+></A
+><P
+><B
+>Example 3-4. Joystick Axis Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    case SDL_JOYAXISMOTION:  /* Handle Joystick Motion */
     if ( ( event.jaxis.value &#60; -3200 ) || (event.jaxis.value &#62; 3200 ) ) 
@@ -300,9 +338,19 @@
       /* code goes here */
     }
     break;</PRE
->
-Another trick with axis events is that up-down and left-right movement are two different sets of axes. The most important axis is axis 0 (left-right) and axis 1 (up-down).  To handle them seperatly in the code we do the following:
-<PRE
+></DIV
+><P
+>Another trick with axis events is that up-down and left-right movement are two different sets of axes. The most important axis is axis 0 (left-right) and axis 1 (up-down).  To handle them seperatly in the code we do the following:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN195"
+></A
+><P
+><B
+>Example 3-5. More Joystick Axis Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    case SDL_JOYAXISMOTION:  /* Handle Joystick Motion */
     if ( ( event.jaxis.value &#60; -3200 ) || (event.jaxis.value &#62; 3200 ) ) 
@@ -318,8 +366,9 @@
         }
     }
     break;</PRE
->
-Ideally the code here should use <TT
+></DIV
+><P
+>Ideally the code here should use <TT
 CLASS="STRUCTFIELD"
 ><I
 >event.jaxis.value</I
@@ -333,8 +382,17 @@
 ></TT
 > values.</P
 ><P
->Button handling is simple compared to the axis checking.
-<PRE
+>Button handling is simple compared to the axis checking.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN203"
+></A
+><P
+><B
+>Example 3-6. Joystick Button Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    case SDL_JOYBUTTONDOWN:  /* Handle Joystick Button Presses */
     if ( event.jbutton.button == 0 ) 
@@ -342,9 +400,9 @@
         /* code goes here */
     }
     break;</PRE
->
-
-Button checks are simpler than axis checks because a button can only be pressed or not pressed.  The <TT
+></DIV
+><P
+>Button checks are simpler than axis checks because a button can only be pressed or not pressed.  The <TT
 CLASS="LITERAL"
 >SDL_JOYBUTTONDOWN</TT
 > event is triggered when a button is pressed and the <TT
@@ -374,12 +432,21 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN156"
+NAME="AEN214"
 >Advanced Joystick Functions</A
 ></H2
 ><P
->That takes care of the controls that you can count on being on every joystick under the sun, but there are a few extra things that SDL can support.  Joyballs are next on our list, they are alot like axis we a few minor differences.  Joyballs store relative changes unlike the the absolute postion stored in a axis event. Also one trackball event contains both the change in x and they change in y.  Our case for it is as follows: 
-<PRE
+>That takes care of the controls that you can count on being on every joystick under the sun, but there are a few extra things that SDL can support.  Joyballs are next on our list, they are alot like axis we a few minor differences.  Joyballs store relative changes unlike the the absolute postion stored in a axis event. Also one trackball event contains both the change in x and they change in y.  Our case for it is as follows:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN217"
+></A
+><P
+><B
+>Example 3-7. Joystick Ball Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    case SDL_JOYBALLMOTION:  /* Handle Joyball Motion */
     if( event.jball.ball == 0 )
@@ -387,8 +454,9 @@
       /* ball handling */
     }
     break;</PRE
->
-The above checks the first joyball on the joystick. The change in position will be stored in <TT
+></DIV
+><P
+>The above checks the first joyball on the joystick. The change in position will be stored in <TT
 CLASS="STRUCTFIELD"
 ><I
 >event.jball.xrel</I
@@ -488,9 +556,17 @@
 ></P
 >
 
-Our case for the hat may resemble the following:
-
-<PRE
+Our case for the hat may resemble the following:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN244"
+></A
+><P
+><B
+>Example 3-8. Joystick Hat Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    case SDL_JOYHATMOTION:  /* Handle Hat Motion */
     if ( event.jhat.hat | SDL_HAT_UP )
@@ -508,7 +584,7 @@
         /* Do right and down together stuff here */
     }
     break;</PRE
-></P
+></DIV
 ><P
 >In addition to the queries for number of joysticks on the system and their names there are additional functions to query the capabilities of attached joysticks:
 <P
@@ -570,18 +646,26 @@
 ></P
 >
 
-To use these functions we just have to pass in the joystick structure we got when we opened the joystick. For Example:
-
-<PRE
+To use these functions we just have to pass in the joystick structure we got when we opened the joystick. For Example:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN265"
+></A
+><P
+><B
+>Example 3-9. Querying Joystick Characteristics</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    int number_of_buttons;
     SDL_Joystick *joystick;
 
     joystick = SDL_JoystickOpen(0);
     number_of_buttons = SDL_JoystickNumButtons(joystick);</PRE
->
-
-This block of code would get the number of buttons on the first joystick in the system.	</P
+></DIV
+><P
+>This block of code would get the number of buttons on the first joystick in the system.	</P
 ></DIV
 ></DIV
 ></DIV
@@ -600,7 +684,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="guidevideo.html"
+HREF="guidevideoopengl.html"
 >Prev</A
 ></TD
 ><TD
@@ -625,7 +709,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Graphics and Video</TD
+>Using OpenGL With SDL</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"

--- a/docs/html/guideinputkeyboard.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guideinputkeyboard.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Handling the Keyboard</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -78,7 +78,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN205"
+NAME="AEN271"
 >Keyboard Related Structures</A
 ></H2
 ><P
@@ -88,7 +88,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN208"
+NAME="AEN274"
 >SDLKey</A
 ></H3
 ><P
@@ -114,7 +114,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN216"
+NAME="AEN282"
 >SDLMod</A
 ></H3
 ><P
@@ -134,7 +134,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN222"
+NAME="AEN288"
 >SDL_keysym</A
 ></H3
 ><PRE
@@ -215,7 +215,7 @@
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN241"
+NAME="AEN307"
 >SDL_KeyboardEvent</A
 ></H3
 ><PRE
@@ -283,7 +283,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN258"
+NAME="AEN324"
 >Reading Keyboard Events</A
 ></H2
 ><P
@@ -308,8 +308,17 @@
 > events using a <TT
 CLASS="LITERAL"
 >switch</TT
-> statement, like so:
-<PRE
+> statement, like so:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN334"
+></A
+><P
+><B
+>Example 3-10. Reading Keyboard Events</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >  SDL_Event event;
   .
@@ -334,15 +343,16 @@
   }
   .
   .</PRE
->
-This is a very basic example. No information about the key press or release is interpreted. We will explore the other extreme out our first full example below - reporting all available information about a keyboard event.</P
+></DIV
+><P
+>This is a very basic example. No information about the key press or release is interpreted. We will explore the other extreme out our first full example below - reporting all available information about a keyboard event.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN269"
+NAME="AEN338"
 >A More Detailed Look</A
 ></H2
 ><P
@@ -384,11 +394,11 @@
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN282"
+NAME="AEN351"
 ></A
 ><P
 ><B
->Example 3-1. keys.c - Key event information</B
+>Example 3-11. Interpreting Key Event Information</B
 ></P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -405,7 +415,7 @@
         int quit = 0;
         
         /* Initialise SDL */
-        if( SDL_Init( SDL_INIT_VIDEO ) ){
+        if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0){
             fprintf( stderr, "Could not initialise SDL: %s\n", SDL_GetError() );
             exit( -1 );
         }
@@ -518,13 +528,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN285"
+NAME="AEN354"
 >Game-type Input</A
 ></H2
 ><P
 >I have found that people using keyboard events for games and other interactive applications don't always understand one fundemental point.</P
 ><A
-NAME="AEN288"
+NAME="AEN357"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -575,8 +585,17 @@
 >
 At first glance you may think this is a perfectly reasonable piece of code for the task, but it isn't. Like I said keyboard events only occur when a key changes state, so the user would have to press and release the left cursor key 100 times to move the alien 100 pixels to the left.</P
 ><P
->To get around this problem we must not use the events to change the position of the alien, we use the events to set flags which are then used in a seperate section of code to move the alien. Something like this:
-<PRE
+>To get around this problem we must not use the events to change the position of the alien, we use the events to set flags which are then used in a seperate section of code to move the alien. Something like this:</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN363"
+></A
+><P
+><B
+>Example 3-12. Proper Game Movement</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
 >    /* Alien screen coordinates */
     int alien_x=0, alien_y=0;
@@ -649,8 +668,9 @@
     /* Update the alien position */
     alien_x += alien_xvel;
     alien_y += alien_yvel;</PRE
->
-As can be seen, we use two extra variables, alien_xvel and alien_yvel, which represent the motion of the ship, it is these variables that we update when we detect keypresses and releases.</P
+></DIV
+><P
+>As can be seen, we use two extra variables, alien_xvel and alien_yvel, which represent the motion of the ship, it is these variables that we update when we detect keypresses and releases.</P
 ></DIV
 ></DIV
 ><DIV

--- a/docs/html/guidepreface.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidepreface.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Preface</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/guidethebasics.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidethebasics.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >The Basics</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"

--- a/docs/html/guidetimeexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidetimeexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Time Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -80,7 +80,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN373"
+NAME="AEN412"
 >Time based game loop</A
 ></H2
 ><P

--- a/docs/html/guidevideo.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidevideo.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Graphics and Video</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -16,8 +16,8 @@
 TITLE="Initializing SDL"
 HREF="guidebasicsinit.html"><LINK
 REL="NEXT"
-TITLE="Input handling"
-HREF="guideinput.html"></HEAD
+TITLE="Using OpenGL With SDL"
+HREF="guidevideoopengl.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFF8DC"
@@ -57,7 +57,7 @@
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="guideinput.html"
+HREF="guidevideoopengl.html"
 >Next</A
 ></TD
 ></TR
@@ -73,572 +73,322 @@
 >Chapter 2. Graphics and Video</A
 ></H1
 ><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+><A
+HREF="guidevideo.html#GUIDEVIDEOINTRO"
+>Introduction to SDL Video</A
+></DT
+><DT
+><A
+HREF="guidevideoopengl.html"
+>Using OpenGL With SDL</A
+></DT
+></DL
+></DIV
+><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="GUIDEVIDEOOPENGL"
->Using OpenGL With SDL</A
+NAME="GUIDEVIDEOINTRO"
+>Introduction to SDL Video</A
 ></H1
 ><P
->SDL has the ability to create and use OpenGL contexts on several platforms(Linux/X11, Win32, BeOS, MacOS Classic/Toolbox, MacOS X, FreeBSD/X11 and Solaris/X11). This allows you to use SDL's audio, event handling, threads and times in your OpenGL applications (a function often performed by GLUT).</P
+>Video is probably the most common thing that SDL is used for, and
+so it has the most complete subsystem. Here are a few
+examples to demonstrate the basics.</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65"
->Initialisation</A
+NAME="AEN68"
+>Initializing the Video Display</A
 ></H2
 ><P
->Initialising SDL to use OpenGL is not very different to initialising SDL normally. There are three differences; you must pass <TT
-CLASS="LITERAL"
->SDL_OPENGL</TT
-> to <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
+>This is what almost all SDL programs have to do in one way or
+another.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN71"
 ></A
->, you must specify several GL attributes (depth buffer size, framebuffer sizes) using <A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
-> and finally, if you wish to use double buffering you must specify it as a GL attribute, <I
-CLASS="EMPHASIS"
->not</I
-> by passing the <TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-> flag to <TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
->.
-<PRE
+><P
+><B
+>Example 2-1. Initializing the Video Display</B
+></P
+><PRE
 CLASS="PROGRAMLISTING"
->    /* Information about the current video settings. */
-    const SDL_VideoInfo* info = NULL;
-    /* Dimensions of our window. */
-    int width = 0;
-    int height = 0;
-    /* Color depth in bits of our window. */
-    int bpp = 0;
-    /* Flags we will pass into SDL_SetVideoMode. */
-    int flags = 0;
+>    SDL_Surface *screen;
 
-    /* First, initialize SDL's video subsystem. */
-    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
-        /* Failed, exit. */
-        fprintf( stderr, "Video initialization failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /* Let's get some video information. */
-    info = SDL_GetVideoInfo( );
-
-    if( !info ) {
-        /* This should probably never happen. */
-        fprintf( stderr, "Video query failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
+    /* Initialize the SDL library */
+    if( SDL_Init(SDL_INIT_VIDEO) &#60; 0 ) {
+        fprintf(stderr,
+                "Couldn't initialize SDL: %s\n", SDL_GetError());
+        exit(1);
     }
 
-    /*
-     * Set our width/height to 640/480 (you would
-     * of course let the user decide this in a normal
-     * app). We get the bpp we will request from
-     * the display. On X11, VidMode can't change
-     * resolution, so this is probably being overly
-     * safe. Under Win32, ChangeDisplaySettings
-     * can change the bpp.
-     */
-    width = 640;
-    height = 480;
-    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
-
+    /* Clean up on exit */
+    atexit(SDL_Quit);
+    
     /*
-     * Now, we want to setup our requested
-     * window attributes for our OpenGL window.
-     * We want *at least* 5 bits of red, green
-     * and blue. We also want at least a 16-bit
-     * depth buffer.
-     *
-     * The last thing we do is request a double
-     * buffered window. '1' turns on double
-     * buffering, '0' turns it off.
-     *
-     * Note that we do not use SDL_DOUBLEBUF in
-     * the flags to SDL_SetVideoMode. That does
-     * not affect the GL attribute state, only
-     * the standard 2D blitting setup.
+     * Initialize the display in a 640x480 8-bit palettized mode,
+     * requesting a software surface
      */
-    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-
-    /*
-     * We want to request that SDL provide us
-     * with an OpenGL window, in a fullscreen
-     * video mode.
-     *
-     * EXERCISE:
-     * Make starting windowed an option, and
-     * handle the resize events properly with
-     * glViewport.
-     */
-    flags = SDL_OPENGL | SDL_FULLSCREEN;
-
-    /*
-     * Set the video mode
-     */
-    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
-        /* 
-         * This could happen for a variety of reasons,
-         * including DISPLAY not being set, the specified
-         * resolution not being available, etc.
-         */
-        fprintf( stderr, "Video mode set failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
+    screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE);
+    if ( screen == NULL ) {
+        fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n",
+                        SDL_GetError());
+        exit(1);
     }</PRE
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN74"
+>Initializing the Best Video Mode</A
+></H2
+><P
+>If you have a preference for a certain pixel depth but will accept any
+other, use SDL_SetVideoMode with SDL_ANYFORMAT as below. You can also
+use SDL_VideoModeOK() to find the native video mode that is closest to
+the mode you request.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN77"
+></A
+><P
+><B
+>Example 2-2. Initializing the Best Video Mode</B
 ></P
+><PRE
+CLASS="PROGRAMLISTING"
+>    /* Have a preference for 8-bit, but accept any depth */
+    screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE|SDL_ANYFORMAT);
+    if ( screen == NULL ) {
+        fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n",
+                        SDL_GetError());
+        exit(1);
+    }
+    printf("Set 640x480 at %d bits-per-pixel mode\n",
+           screen-&#62;format-&#62;BitsPerPixel);</PRE
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN77"
->Drawing</A
+NAME="AEN80"
+>Loading and Displaying a BMP File</A
 ></H2
 ><P
->Apart from initialisation, using OpenGL within SDL is the same as using. However if you have request a double buffered display (using <A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
->) and one (which can be checked by using <A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
->), then you must use <A
-HREF="sdlglswapbuffers.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SwapBuffers()</TT
-></A
-> to swap the buffers and update the display.</P
-><P
->A full example code listing is now presented below.</P
+>The following function loads and displays a BMP file given as
+argument, once SDL is initialised and a video mode has been set.</P
 ><DIV
 CLASS="EXAMPLE"
 ><A
-NAME="AEN87"
+NAME="AEN83"
 ></A
 ><P
 ><B
->Example 2-1. gl.c - SDL OpenGL Example</B
+>Example 2-3. Loading and Displaying a BMP File</B
+></P
+><PRE
+CLASS="PROGRAMLISTING"
+>void display_bmp(char *file_name)
+{
+    SDL_Surface *image;
+
+    /* Load the BMP file into a surface */
+    image = SDL_LoadBMP(file_name);
+    if (image == NULL) {
+        fprintf(stderr, "Couldn't load %s: %s\n", file_name, SDL_GetError());
+        return;
+    }
+
+    /*
+     * Palettized screen modes will have a default palette (a standard
+     * 8*8*4 colour cube), but if the image is palettized as well we can
+     * use that palette for a nicer colour matching
+     */
+    if (image-&#62;format-&#62;palette &#38;&#38; screen-&#62;format-&#62;palette) {
+    SDL_SetColors(screen, image-&#62;format-&#62;palette-&#62;colors, 0,
+                  image-&#62;format-&#62;palette-&#62;ncolors);
+    }
+
+    /* Blit onto the screen surface */
+    if(SDL_BlitSurface(image, NULL, screen, NULL) &#60; 0)
+        fprintf(stderr, "BlitSurface error: %s\n", SDL_GetError());
+
+    SDL_UpdateRect(screen, 0, 0, image-&#62;w, image-&#62;h);
+
+    /* Free the allocated BMP surface */
+    SDL_FreeSurface(image);
+}</PRE
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN86"
+>Drawing Directly to the Display</A
+></H2
+><P
+>The following two functions can be used to get and set single
+pixels of a surface. They are carefully written to work with any depth
+currently supported by SDL. Remember to lock the surface before
+calling them, and to unlock it before calling any other SDL
+functions.</P
+><P
+>To convert between pixel values and their red, green, blue
+components, use SDL_GetRGB() and SDL_MapRGB().</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN90"
+></A
+><P
+><B
+>Example 2-4. getpixel()</B
 ></P
 ><PRE
 CLASS="PROGRAMLISTING"
 >/*
- * SDL OpenGL Tutorial.
- * (c) Michael Vance, 2000
- * briareos@lokigames.com
- *
- * Distributed under terms of the LGPL. 
+ * Return the pixel value at (x, y)
+ * NOTE: The surface must be locked before calling this!
  */
-
-#include &#60;SDL/SDL.h&#62;
-#include &#60;GL/gl.h&#62;
-#include &#60;GL/glu.h&#62;
-
-#include &#60;stdio.h&#62;
-#include &#60;stdlib.h&#62;
-
-static GLboolean should_rotate = GL_TRUE;
-
-static void quit_tutorial( int code )
+Uint32 getpixel(SDL_Surface *surface, int x, int y)
 {
-    /*
-     * Quit SDL so we can release the fullscreen
-     * mode and restore the previous video settings,
-     * etc.
-     */
-    SDL_Quit( );
+    int bpp = surface-&#62;format-&#62;BytesPerPixel;
+    /* Here p is the address to the pixel we want to retrieve */
+    Uint8 *p = (Uint8 *)surface-&#62;pixels + y * surface-&#62;pitch + x * bpp;
+
+    switch(bpp) {
+    case 1:
+        return *p;
 
-    /* Exit program. */
-    exit( code );
-}
+    case 2:
+        return *(Uint16 *)p;
 
-static void handle_key_down( SDL_keysym* keysym )
-{
+    case 3:
+        if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
+            return p[0] &#60;&#60; 16 | p[1] &#60;&#60; 8 | p[2];
+        else
+            return p[0] | p[1] &#60;&#60; 8 | p[2] &#60;&#60; 16;
+
+    case 4:
+        return *(Uint32 *)p;
 
-    /* 
-     * We're only interested if 'Esc' has
-     * been presssed.
-     *
-     * EXERCISE: 
-     * Handle the arrow keys and have that change the
-     * viewing position/angle.
-     */
-    switch( keysym-&#62;sym ) {
-    case SDLK_ESCAPE:
-        quit_tutorial( 0 );
+    default:
+        return 0;       /* shouldn't happen, but avoids warnings */
+    }
+}</PRE
+></DIV
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN93"
+></A
+><P
+><B
+>Example 2-5. putpixel()</B
+></P
+><PRE
+CLASS="PROGRAMLISTING"
+>/*
+ * Set the pixel at (x, y) to the given value
+ * NOTE: The surface must be locked before calling this!
+ */
+void putpixel(SDL_Surface *surface, int x, int y, Uint32 pixel)
+{
+    int bpp = surface-&#62;format-&#62;BytesPerPixel;
+    /* Here p is the address to the pixel we want to set */
+    Uint8 *p = (Uint8 *)surface-&#62;pixels + y * surface-&#62;pitch + x * bpp;
+
+    switch(bpp) {
+    case 1:
+        *p = pixel;
         break;
-    case SDLK_SPACE:
-        should_rotate = !should_rotate;
+
+    case 2:
+        *(Uint16 *)p = pixel;
         break;
-    default:
+
+    case 3:
+        if(SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+            p[0] = (pixel &#62;&#62; 16) &#38; 0xff;
+            p[1] = (pixel &#62;&#62; 8) &#38; 0xff;
+            p[2] = pixel &#38; 0xff;
+        } else {
+            p[0] = pixel &#38; 0xff;
+            p[1] = (pixel &#62;&#62; 8) &#38; 0xff;
+            p[2] = (pixel &#62;&#62; 16) &#38; 0xff;
+        }
+        break;
+
+    case 4:
+        *(Uint32 *)p = pixel;
         break;
     }
-
-}
-
-static void process_events( void )
-{
-    /* Our SDL event placeholder. */
-    SDL_Event event;
-
-    /* Grab all the events off the queue. */
-    while( SDL_PollEvent( &#38;event ) ) {
-
-        switch( event.type ) {
-        case SDL_KEYDOWN:
-            /* Handle key presses. */
-            handle_key_down( &#38;event.key.keysym );
-            break;
-        case SDL_QUIT:
-            /* Handle quit requests (like Ctrl-c). */
-            quit_tutorial( 0 );
-            break;
-        }
-
-    }
-
-}
-
-static void draw_screen( void )
-{
-    /* Our angle of rotation. */
-    static float angle = 0.0f;
+}</PRE
+></DIV
+><P
+>The following code uses the putpixel() function above to set a
+yellow pixel in the middle of the screen.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN97"
+></A
+><P
+><B
+>Example 2-6. Using putpixel()</B
+></P
+><PRE
+CLASS="PROGRAMLISTING"
+>&#13;    /* Code to set a yellow pixel at the center of the screen */
 
-    /*
-     * EXERCISE:
-     * Replace this awful mess with vertex
-     * arrays and a call to glDrawElements.
-     *
-     * EXERCISE:
-     * After completing the above, change
-     * it to use compiled vertex arrays.
-     *
-     * EXERCISE:
-     * Verify my windings are correct here ;).
-     */
-    static GLfloat v0[] = { -1.0f, -1.0f,  1.0f };
-    static GLfloat v1[] = {  1.0f, -1.0f,  1.0f };
-    static GLfloat v2[] = {  1.0f,  1.0f,  1.0f };
-    static GLfloat v3[] = { -1.0f,  1.0f,  1.0f };
-    static GLfloat v4[] = { -1.0f, -1.0f, -1.0f };
-    static GLfloat v5[] = {  1.0f, -1.0f, -1.0f };
-    static GLfloat v6[] = {  1.0f,  1.0f, -1.0f };
-    static GLfloat v7[] = { -1.0f,  1.0f, -1.0f };
-    static GLubyte red[]    = { 255,   0,   0, 255 };
-    static GLubyte green[]  = {   0, 255,   0, 255 };
-    static GLubyte blue[]   = {   0,   0, 255, 255 };
-    static GLubyte white[]  = { 255, 255, 255, 255 };
-    static GLubyte yellow[] = {   0, 255, 255, 255 };
-    static GLubyte black[]  = {   0,   0,   0, 255 };
-    static GLubyte orange[] = { 255, 255,   0, 255 };
-    static GLubyte purple[] = { 255,   0, 255,   0 };
+    int x, y;
+    Uint32 yellow;
+
+    /* Map the color yellow to this display (R=0xff, G=0xFF, B=0x00)
+       Note:  If the display is palettized, you must set the palette first.
+    */
+    yellow = SDL_MapRGB(screen-&#62;format, 0xff, 0xff, 0x00);
 
-    /* Clear the color and depth buffers. */
-    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-    /* We don't want to modify the projection matrix. */
-    glMatrixMode( GL_MODELVIEW );
-    glLoadIdentity( );
-
-    /* Move down the z-axis. */
-    glTranslatef( 0.0, 0.0, -5.0 );
+    x = screen-&#62;w / 2;
+    y = screen-&#62;h / 2;
 
-    /* Rotate. */
-    glRotatef( angle, 0.0, 1.0, 0.0 );
-
-    if( should_rotate ) {
-
-        if( ++angle &#62; 360.0f ) {
-            angle = 0.0f;
+    /* Lock the screen for direct access to the pixels */
+    if ( SDL_MUSTLOCK(screen) ) {
+        if ( SDL_LockSurface(screen) &#60; 0 ) {
+            fprintf(stderr, "Can't lock screen: %s\n", SDL_GetError());
+            return;
         }
-
     }
 
-    /* Send our triangle data to the pipeline. */
-    glBegin( GL_TRIANGLES );
-
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-
-    glEnd( );
-
-    /*
-     * EXERCISE:
-     * Draw text telling the user that 'Spc'
-     * pauses the rotation and 'Esc' quits.
-     * Do it using vetors and textured quads.
-     */
-
-    /*
-     * Swap the buffers. This this tells the driver to
-     * render the next frame from the contents of the
-     * back-buffer, and to set all rendering operations
-     * to occur on what was the front-buffer.
-     *
-     * Double buffering prevents nasty visual tearing
-     * from the application drawing on areas of the
-     * screen that are being updated at the same time.
-     */
-    SDL_GL_SwapBuffers( );
-}
-
-static void setup_opengl( int width, int height )
-{
-    float ratio = (float) width / (float) height;
-
-    /* Our shading model--Gouraud (smooth). */
-    glShadeModel( GL_SMOOTH );
-
-    /* Culling. */
-    glCullFace( GL_BACK );
-    glFrontFace( GL_CCW );
-    glEnable( GL_CULL_FACE );
-
-    /* Set the clear color. */
-    glClearColor( 0, 0, 0, 0 );
-
-    /* Setup our viewport. */
-    glViewport( 0, 0, width, height );
+    putpixel(screen, x, y, yellow);
 
-    /*
-     * Change to the projection matrix and set
-     * our viewing volume.
-     */
-    glMatrixMode( GL_PROJECTION );
-    glLoadIdentity( );
-    /*
-     * EXERCISE:
-     * Replace this with a call to glFrustum.
-     */
-    gluPerspective( 60.0, ratio, 1.0, 1024.0 );
-}
-
-int main( int argc, char* argv[] )
-{
-    /* Information about the current video settings. */
-    const SDL_VideoInfo* info = NULL;
-    /* Dimensions of our window. */
-    int width = 0;
-    int height = 0;
-    /* Color depth in bits of our window. */
-    int bpp = 0;
-    /* Flags we will pass into SDL_SetVideoMode. */
-    int flags = 0;
-
-    /* First, initialize SDL's video subsystem. */
-    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
-        /* Failed, exit. */
-        fprintf( stderr, "Video initialization failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
+    if ( SDL_MUSTLOCK(screen) ) {
+        SDL_UnlockSurface(screen);
     }
-
-    /* Let's get some video information. */
-    info = SDL_GetVideoInfo( );
-
-    if( !info ) {
-        /* This should probably never happen. */
-        fprintf( stderr, "Video query failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /*
-     * Set our width/height to 640/480 (you would
-     * of course let the user decide this in a normal
-     * app). We get the bpp we will request from
-     * the display. On X11, VidMode can't change
-     * resolution, so this is probably being overly
-     * safe. Under Win32, ChangeDisplaySettings
-     * can change the bpp.
-     */
-    width = 640;
-    height = 480;
-    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
+    /* Update just the part of the display that we've changed */
+    SDL_UpdateRect(screen, x, y, 1, 1);
 
-    /*
-     * Now, we want to setup our requested
-     * window attributes for our OpenGL window.
-     * We want *at least* 5 bits of red, green
-     * and blue. We also want at least a 16-bit
-     * depth buffer.
-     *
-     * The last thing we do is request a double
-     * buffered window. '1' turns on double
-     * buffering, '0' turns it off.
-     *
-     * Note that we do not use SDL_DOUBLEBUF in
-     * the flags to SDL_SetVideoMode. That does
-     * not affect the GL attribute state, only
-     * the standard 2D blitting setup.
-     */
-    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-
-    /*
-     * We want to request that SDL provide us
-     * with an OpenGL window, in a fullscreen
-     * video mode.
-     *
-     * EXERCISE:
-     * Make starting windowed an option, and
-     * handle the resize events properly with
-     * glViewport.
-     */
-    flags = SDL_OPENGL | SDL_FULLSCREEN;
-
-    /*
-     * Set the video mode
-     */
-    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
-        /* 
-         * This could happen for a variety of reasons,
-         * including DISPLAY not being set, the specified
-         * resolution not being available, etc.
-         */
-        fprintf( stderr, "Video mode set failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /*
-     * At this point, we should have a properly setup
-     * double-buffered window for use with OpenGL.
-     */
-    setup_opengl( width, height );
-
-    /*
-     * Now we want to begin our normal app process--
-     * an event loop with a lot of redrawing.
-     */
-    while( 1 ) {
-        /* Process incoming events. */
-        process_events( );
-        /* Draw the screen. */
-        draw_screen( );
-    }
-
-    /*
-     * EXERCISE:
-     * Record timings using SDL_GetTicks() and
-     * and print out frames per second at program
-     * end.
-     */
-
-    /* Never reached. */
-    return 0;
-}</PRE
+    return;&#13;</PRE
 ></DIV
 ></DIV
 ></DIV
@@ -674,7 +424,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="guideinput.html"
+HREF="guidevideoopengl.html"
 >Next</A
 ></TD
 ></TR
@@ -696,7 +446,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Input handling</TD
+>Using OpenGL With SDL</TD
 ></TR
 ></TABLE
 ></DIV

--- a/docs/html/guidevideoexamples.html	Sun Jun 10 18:39:47 2001 +0000
+++ b/docs/html/guidevideoexamples.html	Sun Jun 10 19:31:57 2001 +0000
@@ -4,7 +4,7 @@
 >Video Examples</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.61
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
 "><LINK
 REL="HOME"
 TITLE="SDL Library Documentation"
@@ -80,7 +80,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN303"
+NAME="AEN375"
 >Initializing the video display</A
 ></H2
 ><P
@@ -112,7 +112,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN307"
+NAME="AEN379"
 >Initializing the best video mode</A
 ></H2
 ><P
@@ -134,7 +134,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN311"
+NAME="AEN383"
 >Loading and displaying a BMP file</A
 ></H2
 ><P
@@ -211,7 +211,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN315"
+NAME="AEN387"
 >Drawing directly to the display</A
 ></H2
 ><P
@@ -276,7 +276,7 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN319"
+NAME="AEN391"
 >Fastest possible surface blit</A
 ></H2
 ><P

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/guidevideoopengl.html	Sun Jun 10 19:31:57 2001 +0000
@@ -0,0 +1,719 @@
+<HTML
+><HEAD
+><TITLE
+>Using OpenGL With SDL</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="SDL Library Documentation"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Graphics and Video"
+HREF="guidevideo.html"><LINK
+REL="PREVIOUS"
+TITLE="Graphics and Video"
+HREF="guidevideo.html"><LINK
+REL="NEXT"
+TITLE="Input handling"
+HREF="guideinput.html"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#FFF8DC"
+TEXT="#000000"
+LINK="#0000ee"
+VLINK="#551a8b"
+ALINK="#ff0000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SDL Library Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="guidevideo.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 2. Graphics and Video</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="guideinput.html"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="GUIDEVIDEOOPENGL"
+>Using OpenGL With SDL</A
+></H1
+><P
+>SDL has the ability to create and use OpenGL contexts on several platforms(Linux/X11, Win32, BeOS, MacOS Classic/Toolbox, MacOS X, FreeBSD/X11 and Solaris/X11). This allows you to use SDL's audio, event handling, threads and times in your OpenGL applications (a function often performed by GLUT).</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN103"
+>Initialisation</A
+></H2
+><P
+>Initialising SDL to use OpenGL is not very different to initialising SDL normally. There are three differences; you must pass <TT
+CLASS="LITERAL"
+>SDL_OPENGL</TT
+> to <A
+HREF="sdlsetvideomode.html"
+><TT
+CLASS="FUNCTION"
+>SDL_SetVideoMode</TT
+></A
+>, you must specify several GL attributes (depth buffer size, framebuffer sizes) using <A
+HREF="sdlglsetattribute.html"
+><TT
+CLASS="FUNCTION"
+>SDL_GL_SetAttribute</TT
+></A
+> and finally, if you wish to use double buffering you must specify it as a GL attribute, <I
+CLASS="EMPHASIS"
+>not</I
+> by passing the <TT
+CLASS="LITERAL"
+>SDL_DOUBLEBUF</TT
+> flag to <TT
+CLASS="FUNCTION"
+>SDL_SetVideoMode</TT
+>.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN114"
+></A
+><P
+><B
+>Example 2-7. Initializing SDL with OpenGL</B
+></P
+><PRE
+CLASS="PROGRAMLISTING"
+>    /* Information about the current video settings. */
+    const SDL_VideoInfo* info = NULL;
+    /* Dimensions of our window. */
+    int width = 0;
+    int height = 0;
+    /* Color depth in bits of our window. */
+    int bpp = 0;
+    /* Flags we will pass into SDL_SetVideoMode. */
+    int flags = 0;
+
+    /* First, initialize SDL's video subsystem. */
+    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
+        /* Failed, exit. */
+        fprintf( stderr, "Video initialization failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }
+
+    /* Let's get some video information. */
+    info = SDL_GetVideoInfo( );
+
+    if( !info ) {
+        /* This should probably never happen. */
+        fprintf( stderr, "Video query failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }
+
+    /*
+     * Set our width/height to 640/480 (you would
+     * of course let the user decide this in a normal
+     * app). We get the bpp we will request from
+     * the display. On X11, VidMode can't change
+     * resolution, so this is probably being overly
+     * safe. Under Win32, ChangeDisplaySettings
+     * can change the bpp.
+     */
+    width = 640;
+    height = 480;
+    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
+
+    /*
+     * Now, we want to setup our requested
+     * window attributes for our OpenGL window.
+     * We want *at least* 5 bits of red, green
+     * and blue. We also want at least a 16-bit
+     * depth buffer.
+     *
+     * The last thing we do is request a double
+     * buffered window. '1' turns on double
+     * buffering, '0' turns it off.
+     *
+     * Note that we do not use SDL_DOUBLEBUF in
+     * the flags to SDL_SetVideoMode. That does
+     * not affect the GL attribute state, only
+     * the standard 2D blitting setup.
+     */
+    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
+    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
+    /*
+     * We want to request that SDL provide us
+     * with an OpenGL window, in a fullscreen
+     * video mode.
+     *
+     * EXERCISE:
+     * Make starting windowed an option, and
+     * handle the resize events properly with
+     * glViewport.
+     */
+    flags = SDL_OPENGL | SDL_FULLSCREEN;
+
+    /*
+     * Set the video mode
+     */
+    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
+        /* 
+         * This could happen for a variety of reasons,
+         * including DISPLAY not being set, the specified
+         * resolution not being available, etc.
+         */
+        fprintf( stderr, "Video mode set failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }</PRE
+></DIV
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN117"
+>Drawing</A
+></H2
+><P
+>Apart from initialisation, using OpenGL within SDL is the same as using OpenGL
+with any other API, e.g. GLUT. You still use all the same function calls and
+data types. However if you are using a double-buffered display, then you must
+use
+<A
+HREF="sdlglswapbuffers.html"
+><TT
+CLASS="FUNCTION"
+>SDL_GL_SwapBuffers()</TT
+></A
+>
+to swap the buffers and update the display. To request double-buffering
+with OpenGL, use
+<A
+HREF="sdlglsetattribute.html"
+><TT
+CLASS="FUNCTION"
+>SDL_GL_SetAttribute</TT
+></A
+>
+with <TT
+CLASS="LITERAL"
+>SDL_GL_DOUBLEBUFFER</TT
+>, and use
+<A
+HREF="sdlglgetattribute.html"
+><TT
+CLASS="FUNCTION"
+>SDL_GL_GetAttribute</TT
+></A
+>
+to see if you actually got it.</P
+><P
+>A full example code listing is now presented below.</P
+><DIV
+CLASS="EXAMPLE"
+><A
+NAME="AEN128"
+></A
+><P
+><B
+>Example 2-8. SDL and OpenGL</B
+></P
+><PRE
+CLASS="PROGRAMLISTING"
+>/*
+ * SDL OpenGL Tutorial.
+ * (c) Michael Vance, 2000
+ * briareos@lokigames.com
+ *
+ * Distributed under terms of the LGPL. 
+ */
+
+#include &#60;SDL/SDL.h&#62;
+#include &#60;GL/gl.h&#62;
+#include &#60;GL/glu.h&#62;
+
+#include &#60;stdio.h&#62;
+#include &#60;stdlib.h&#62;
+
+static GLboolean should_rotate = GL_TRUE;
+
+static void quit_tutorial( int code )
+{
+    /*
+     * Quit SDL so we can release the fullscreen
+     * mode and restore the previous video settings,
+     * etc.
+     */
+    SDL_Quit( );
+
+    /* Exit program. */
+    exit( code );
+}
+
+static void handle_key_down( SDL_keysym* keysym )
+{
+
+    /* 
+     * We're only interested if 'Esc' has
+     * been presssed.
+     *
+     * EXERCISE: 
+     * Handle the arrow keys and have that change the
+     * viewing position/angle.
+     */
+    switch( keysym-&#62;sym ) {
+    case SDLK_ESCAPE:
+        quit_tutorial( 0 );
+        break;
+    case SDLK_SPACE:
+        should_rotate = !should_rotate;
+        break;
+    default:
+        break;
+    }
+
+}
+
+static void process_events( void )
+{
+    /* Our SDL event placeholder. */
+    SDL_Event event;
+
+    /* Grab all the events off the queue. */
+    while( SDL_PollEvent( &#38;event ) ) {
+
+        switch( event.type ) {
+        case SDL_KEYDOWN:
+            /* Handle key presses. */
+            handle_key_down( &#38;event.key.keysym );
+            break;
+        case SDL_QUIT:
+            /* Handle quit requests (like Ctrl-c). */
+            quit_tutorial( 0 );
+            break;
+        }
+
+    }
+
+}
+
+static void draw_screen( void )
+{
+    /* Our angle of rotation. */
+    static float angle = 0.0f;
+
+    /*
+     * EXERCISE:
+     * Replace this awful mess with vertex
+     * arrays and a call to glDrawElements.
+     *
+     * EXERCISE:
+     * After completing the above, change
+     * it to use compiled vertex arrays.
+     *
+     * EXERCISE:
+     * Verify my windings are correct here ;).
+     */
+    static GLfloat v0[] = { -1.0f, -1.0f,  1.0f };
+    static GLfloat v1[] = {  1.0f, -1.0f,  1.0f };
+    static GLfloat v2[] = {  1.0f,  1.0f,  1.0f };
+    static GLfloat v3[] = { -1.0f,  1.0f,  1.0f };
+    static GLfloat v4[] = { -1.0f, -1.0f, -1.0f };
+    static GLfloat v5[] = {  1.0f, -1.0f, -1.0f };
+    static GLfloat v6[] = {  1.0f,  1.0f, -1.0f };
+    static GLfloat v7[] = { -1.0f,  1.0f, -1.0f };
+    static GLubyte red[]    = { 255,   0,   0, 255 };
+    static GLubyte green[]  = {   0, 255,   0, 255 };
+    static GLubyte blue[]   = {   0,   0, 255, 255 };
+    static GLubyte white[]  = { 255, 255, 255, 255 };
+    static GLubyte yellow[] = {   0, 255, 255, 255 };
+    static GLubyte black[]  = {   0,   0,   0, 255 };
+    static GLubyte orange[] = { 255, 255,   0, 255 };
+    static GLubyte purple[] = { 255,   0, 255,   0 };
+
+    /* Clear the color and depth buffers. */
+    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+    /* We don't want to modify the projection matrix. */
+    glMatrixMode( GL_MODELVIEW );
+    glLoadIdentity( );
+
+    /* Move down the z-axis. */
+    glTranslatef( 0.0, 0.0, -5.0 );
+
+    /* Rotate. */
+    glRotatef( angle, 0.0, 1.0, 0.0 );
+
+    if( should_rotate ) {
+
+        if( ++angle &#62; 360.0f ) {
+            angle = 0.0f;
+        }
+
+    }
+
+    /* Send our triangle data to the pipeline. */
+    glBegin( GL_TRIANGLES );
+
+    glColor4ubv( red );
+    glVertex3fv( v0 );
+    glColor4ubv( green );
+    glVertex3fv( v1 );
+    glColor4ubv( blue );
+    glVertex3fv( v2 );
+
+    glColor4ubv( red );
+    glVertex3fv( v0 );
+    glColor4ubv( blue );
+    glVertex3fv( v2 );
+    glColor4ubv( white );
+    glVertex3fv( v3 );
+
+    glColor4ubv( green );
+    glVertex3fv( v1 );
+    glColor4ubv( black );
+    glVertex3fv( v5 );
+    glColor4ubv( orange );
+    glVertex3fv( v6 );
+
+    glColor4ubv( green );
+    glVertex3fv( v1 );
+    glColor4ubv( orange );
+    glVertex3fv( v6 );
+    glColor4ubv( blue );
+    glVertex3fv( v2 );
+
+    glColor4ubv( black );
+    glVertex3fv( v5 );
+    glColor4ubv( yellow );
+    glVertex3fv( v4 );
+    glColor4ubv( purple );
+    glVertex3fv( v7 );
+
+    glColor4ubv( black );
+    glVertex3fv( v5 );
+    glColor4ubv( purple );
+    glVertex3fv( v7 );
+    glColor4ubv( orange );
+    glVertex3fv( v6 );
+
+    glColor4ubv( yellow );
+    glVertex3fv( v4 );
+    glColor4ubv( red );
+    glVertex3fv( v0 );
+    glColor4ubv( white );
+    glVertex3fv( v3 );
+
+    glColor4ubv( yellow );
+    glVertex3fv( v4 );
+    glColor4ubv( white );
+    glVertex3fv( v3 );
+    glColor4ubv( purple );
+    glVertex3fv( v7 );
+
+    glColor4ubv( white );
+    glVertex3fv( v3 );
+    glColor4ubv( blue );
+    glVertex3fv( v2 );
+    glColor4ubv( orange );
+    glVertex3fv( v6 );
+
+    glColor4ubv( white );
+    glVertex3fv( v3 );
+    glColor4ubv( orange );
+    glVertex3fv( v6 );
+    glColor4ubv( purple );
+    glVertex3fv( v7 );
+
+    glColor4ubv( green );
+    glVertex3fv( v1 );
+    glColor4ubv( red );
+    glVertex3fv( v0 );
+    glColor4ubv( yellow );
+    glVertex3fv( v4 );
+
+    glColor4ubv( green );
+    glVertex3fv( v1 );
+    glColor4ubv( yellow );
+    glVertex3fv( v4 );
+    glColor4ubv( black );
+    glVertex3fv( v5 );
+
+    glEnd( );
+
+    /*
+     * EXERCISE:
+     * Draw text telling the user that 'Spc'
+     * pauses the rotation and 'Esc' quits.
+     * Do it using vetors and textured quads.
+     */
+
+    /*
+     * Swap the buffers. This this tells the driver to
+     * render the next frame from the contents of the
+     * back-buffer, and to set all rendering operations
+     * to occur on what was the front-buffer.
+     *
+     * Double buffering prevents nasty visual tearing
+     * from the application drawing on areas of the
+     * screen that are being updated at the same time.
+     */
+    SDL_GL_SwapBuffers( );
+}
+
+static void setup_opengl( int width, int height )
+{
+    float ratio = (float) width / (float) height;
+
+    /* Our shading model--Gouraud (smooth). */
+    glShadeModel( GL_SMOOTH );
+
+    /* Culling. */
+    glCullFace( GL_BACK );
+    glFrontFace( GL_CCW );
+    glEnable( GL_CULL_FACE );
+
+    /* Set the clear color. */
+    glClearColor( 0, 0, 0, 0 );
+
+    /* Setup our viewport. */
+    glViewport( 0, 0, width, height );
+
+    /*
+     * Change to the projection matrix and set
+     * our viewing volume.
+     */
+    glMatrixMode( GL_PROJECTION );
+    glLoadIdentity( );
+    /*
+     * EXERCISE:
+     * Replace this with a call to glFrustum.
+     */
+    gluPerspective( 60.0, ratio, 1.0, 1024.0 );
+}
+
+int main( int argc, char* argv[] )
+{
+    /* Information about the current video settings. */
+    const SDL_VideoInfo* info = NULL;
+    /* Dimensions of our window. */
+    int width = 0;
+    int height = 0;
+    /* Color depth in bits of our window. */
+    int bpp = 0;
+    /* Flags we will pass into SDL_SetVideoMode. */
+    int flags = 0;
+
+    /* First, initialize SDL's video subsystem. */
+    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
+        /* Failed, exit. */
+        fprintf( stderr, "Video initialization failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }
+
+    /* Let's get some video information. */
+    info = SDL_GetVideoInfo( );
+
+    if( !info ) {
+        /* This should probably never happen. */
+        fprintf( stderr, "Video query failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }
+
+    /*
+     * Set our width/height to 640/480 (you would
+     * of course let the user decide this in a normal
+     * app). We get the bpp we will request from
+     * the display. On X11, VidMode can't change
+     * resolution, so this is probably being overly
+     * safe. Under Win32, ChangeDisplaySettings
+     * can change the bpp.
+     */
+    width = 640;
+    height = 480;
+    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
+
+    /*
+     * Now, we want to setup our requested
+     * window attributes for our OpenGL window.
+     * We want *at least* 5 bits of red, green
+     * and blue. We also want at least a 16-bit
+     * depth buffer.
+     *
+     * The last thing we do is request a double
+     * buffered window. '1' turns on double
+     * buffering, '0' turns it off.
+     *
+     * Note that we do not use SDL_DOUBLEBUF in
+     * the flags to SDL_SetVideoMode. That does
+     * not affect the GL attribute state, only
+     * the standard 2D blitting setup.
+     */
+    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
+    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
+    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
+    /*
+     * We want to request that SDL provide us
+     * with an OpenGL window, in a fullscreen
+     * video mode.
+     *
+     * EXERCISE:
+     * Make starting windowed an option, and
+     * handle the resize events properly with
+     * glViewport.
+     */
+    flags = SDL_OPENGL | SDL_FULLSCREEN;
+
+    /*
+     * Set the video mode
+     */
+    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
+        /* 
+         * This could happen for a variety of reasons,
+         * including DISPLAY not being set, the specified
+         * resolution not being available, etc.
+         */
+        fprintf( stderr, "Video mode set failed: %s\n",
+             SDL_GetError( ) );
+        quit_tutorial( 1 );
+    }
+
+    /*
+     * At this point, we should have a properly setup
+     * double-buffered window for use with OpenGL.
+     */
+    setup_opengl( width, height );
+
+    /*
+     * Now we want to begin our normal app process--
+     * an event loop with a lot of redrawing.
+     */
+    while( 1 ) {
+        /* Process incoming events. */
+        process_events( );
+        /* Draw the screen. */
+        draw_screen( );
+    }
+
+    /*
+     * EXERCISE:
+     * Record timings using SDL_GetTicks() and
+     * and print out frames per second at program
+     * end.
+     */
+
+    /* Never reached. */
+    return 0;
+}</PRE
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="guidevideo.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="guideinput.html"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Graphics and Video</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="guidevideo.html"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Input handling</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file