rubygame 2.2.0-i586-linux

data/ext/rubygame/rubygame_gfx.h

@@ -0,0 +1,101 @@
+/*
+ *--
+ * Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+ * Copyright (C) 2004-2007  John Croisant
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *++
+ */
+
+#ifndef _RUBYGAME_GFX_H
+#define _RUBYGAME_GFX_H
+
+#include <SDL_gfxPrimitives.h>
+#include <SDL_rotozoom.h>
+
+#ifndef SDL_GFXPRIMITIVES_MAJOR
+#define SDL_GFXPRIMITIVES_MAJOR 0
+#endif
+
+#ifndef SDL_GFXPRIMITIVES_MINOR
+#define SDL_GFXPRIMITIVES_MINOR 0
+#endif
+
+#ifndef SDL_GFXPRIMITIVES_MICRO
+#define SDL_GFXPRIMITIVES_MICRO 0
+#endif
+
+
+/* If we have at least version 2.0.12 of SDL_gfxPrimitives, draw_pie calls 
+   filledPieRGBA, otherwise it calls filledpieRGBA (lowercase pie)*/
+#ifndef HAVE_UPPERCASEPIE
+#if ((SDL_GFXPRIMITIVES_MAJOR > 2) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR > 0) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR == 0 && SDL_GFXPRIMITIVES_MICRO >= 12))
+#define HAVE_UPPERCASEPIE
+#endif
+#endif
+
+/* Separate X/Y rotozoom scaling was not supported prior to 2.0.13. */
+/* Check if we have at least version 2.0.13 of SDL_gfxPrimitives */
+#ifndef HAVE_ROTOZOOMXY
+#if ((SDL_GFXPRIMITIVES_MAJOR > 2) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR > 0) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR == 0 && SDL_GFXPRIMITIVES_MICRO >= 13))
+#define HAVE_ROTOZOOMXY
+#endif
+#endif
+
+/* Non-filled pie shapes (arcs) were not supported prior to 2.0.11. */
+/* Check if we have at least version 2.0.11 of SDL_gfxPrimitives */
+#ifndef HAVE_NONFILLEDPIE
+#if ((SDL_GFXPRIMITIVES_MAJOR > 2) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR > 0) || (SDL_GFXPRIMITIVES_MAJOR == 2 && SDL_GFXPRIMITIVES_MINOR == 0 && SDL_GFXPRIMITIVES_MICRO >= 11))
+#define HAVE_NONFILLEDPIE
+#endif
+#endif
+
+extern void Init_rubygame_gfx();
+extern void extract_xy(VALUE, Sint16*, Sint16*);
+
+extern void draw_line(VALUE, VALUE, VALUE, VALUE, int);
+extern VALUE rbgm_draw_line(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_aaline(VALUE, VALUE, VALUE, VALUE);
+
+extern void draw_rect(VALUE, VALUE, VALUE, VALUE, int);
+extern VALUE rbgm_draw_rect(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_fillrect(VALUE, VALUE, VALUE, VALUE);
+
+extern void draw_circle(VALUE, VALUE, VALUE, VALUE, int, int);
+extern VALUE rbgm_draw_circle(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_aacircle(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_fillcircle(VALUE, VALUE, VALUE, VALUE);
+
+extern void draw_ellipse(VALUE, VALUE, VALUE, VALUE, int, int);
+extern VALUE rbgm_draw_ellipse(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_aaellipse(VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_fillellipse(VALUE, VALUE, VALUE, VALUE);
+
+extern void draw_pie(VALUE, VALUE, VALUE, VALUE, VALUE, int);
+extern VALUE rbgm_draw_pie(VALUE, VALUE, VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_fillpie(VALUE, VALUE, VALUE, VALUE, VALUE);
+
+extern void draw_polygon(VALUE, VALUE, VALUE, int, int);
+extern VALUE rbgm_draw_polygon(VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_aapolygon(VALUE, VALUE, VALUE);
+extern VALUE rbgm_draw_fillpolygon(VALUE, VALUE, VALUE);
+
+extern VALUE rbgm_transform_rotozoom(int, VALUE*, VALUE);
+extern VALUE rbgm_transform_rotozoomsize(int, VALUE*, VALUE);
+
+extern VALUE rbgm_transform_zoom(int, VALUE*, VALUE);
+extern VALUE rbgm_transform_zoomsize(int, VALUE*, VALUE);
+
+#endif

data/ext/rubygame/rubygame_gl.c

@@ -0,0 +1,154 @@
+/*
+ *  OpenGL attribute methods.
+ * --
+ *  Rubygame -- Ruby classes and bindings to SDL to facilitate game creation
+ *  Copyright (C) 2004-2007  John Croisant
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ++
+ */
+
+#include "rubygame_shared.h"
+#include "rubygame_gl.h"
+
+/* --
+ * Most code is directly from Ruby/SDL's rubysdl_opengl.c file.
+ *
+ * Many thanks for saving me some time. :)
+ * ++
+ */
+
+VALUE mGL;
+void Rubygame_Init_GL();
+void Define_GL_Constants();
+
+#ifdef HAVE_OPENGL
+
+VALUE rbgm_gl_getattrib(VALUE, VALUE);
+VALUE rbgm_gl_setattrib(VALUE,VALUE,VALUE);
+VALUE rbgm_gl_swapbuffers(VALUE);
+
+/*  call-seq:
+ *    get_attrib( attrib )  ->  Integer
+ *
+ *  Return the value of the the SDL/OpenGL attribute identified by +attrib+,
+ *  which should be one of the constants defined in the Rubygame::GL module.
+ *  See #set_attrib for a list of attribute constants.
+ *
+ *  This method is useful after using #set_attrib and calling Screen#set_mode,
+ *  to make sure the attribute is the expected value.
+ */
+VALUE rbgm_gl_getattrib(VALUE module, VALUE attr)
+{
+  int val;
+  if(SDL_GL_GetAttribute(NUM2INT(attr),&val)==-1)
+    rb_raise(eSDLError,"GL get attribute failed: %s",SDL_GetError());
+  return INT2NUM(val);
+}
+
+/*  call-seq:
+ *    set_attrib( attrib, value )  ->  nil
+ *
+ *  Set the SDL/OpenGL attribute +attrib+ to +value+. This should be called
+ *  *before* you call Screen#set_mode with the OPENGL flag. You may wish to
+ *  use #get_attrib after calling Screen#set_mode to confirm that the attribute
+ *  is set to the desired value.
+ *
+ *  The full list of SDL/OpenGL attribute identifier constants (located under
+ *  the Rubygame::GL module) is as follows:
+ *
+ *  RED_SIZE::         Size of framebuffer red component, in bits.
+ *  GREEN_SIZE::       Size of framebuffer green component, in bits.
+ *  BLUE_SIZE::        Size of framebuffer blue component, in bits.
+ *  ALPHA_SIZE::       Size of framebuffer alpha (opacity) component, in bits.
+ *  BUFFER_SIZE::      Size of framebuffer, in bits.
+ *  DOUBLEBUFFER::     Enable or disable double-buffering.
+ *  DEPTH_SIZE::       Size of depth buffer, in bits.
+ *  STENCIL_SIZE::     Size of stencil buffer, in bits.
+ *  ACCUM_RED_SIZE::   Size of accumulation buffer red component, in bits.
+ *  ACCUM_GREEN_SIZE:: Size of accumulation buffer green component, in bits.
+ *  ACCUM_BLUE_SIZE::  Size of accumulation buffer blue component, in bits.
+ *  ACCUM_ALPHA_SIZE:: Size of accumulation buffer alpha component, in bits.
+ *  
+ */
+VALUE rbgm_gl_setattrib(VALUE module,VALUE attr,VALUE val)
+{
+  if(SDL_GL_SetAttribute(NUM2INT(attr),NUM2INT(val))==-1)
+    rb_raise(eSDLError,"GL set attribute failed: %s",SDL_GetError());
+  return Qnil;
+}
+
+/*  call-seq:
+ *    swap_buffers( )  ->  nil
+ *
+ *  Swap the back and front buffers, for double-buffered OpenGL displays.
+ *  Should be safe to use (albeit with no effect) on single-buffered OpenGL 
+ *  displays.
+ */
+VALUE rbgm_gl_swapbuffers(VALUE module)
+{
+  SDL_GL_SwapBuffers();
+  return Qnil;
+}
+
+#endif
+
+/*  Document-module: Rubygame::GL
+ *
+ *  The GL module provides an interface to SDL's OpenGL-related functions,
+ *  allowing a Rubygame application to create hardware-accelerated 3D graphics
+ *  with OpenGL.
+ *
+ *  Please note that Rubygame itself does not provide an interface to OpenGL
+ *  functions -- only functions which allow Rubygame to work together with
+ *  OpenGL. You will need to use another library, for example 
+ *  ruby-opengl[http://ruby-opengl.rubyforge.org/], 
+ *  to actually create graphics with OpenGL.
+ *
+ *  Users who wish to use Rubygame Surfaces as textures in OpenGL should
+ *  see also the Surface#pixels method.
+ */
+void Rubygame_Init_GL()
+{
+#if 0
+	mRubygame = rb_define_module("Rubygame");
+#endif
+
+  mGL = rb_define_module_under(mRubygame,"GL");
+  Define_GL_Constants();
+
+#ifdef HAVE_OPENGL
+  rb_define_module_function(mGL,"get_attrib", rbgm_gl_getattrib, 1);
+  rb_define_module_function(mGL,"set_attrib", rbgm_gl_setattrib, 2);
+  rb_define_module_function(mGL,"swap_buffers", rbgm_gl_swapbuffers, 0);
+#endif
+
+}
+
+void Define_GL_Constants()
+{
+  rb_define_const(mGL,"RED_SIZE",INT2NUM(SDL_GL_RED_SIZE));
+  rb_define_const(mGL,"GREEN_SIZE",INT2NUM(SDL_GL_GREEN_SIZE));
+  rb_define_const(mGL,"BLUE_SIZE",INT2NUM(SDL_GL_BLUE_SIZE));
+  rb_define_const(mGL,"ALPHA_SIZE",INT2NUM(SDL_GL_ALPHA_SIZE));
+  rb_define_const(mGL,"BUFFER_SIZE",INT2NUM(SDL_GL_BUFFER_SIZE));
+  rb_define_const(mGL,"DOUBLEBUFFER",INT2NUM(SDL_GL_DOUBLEBUFFER));
+  rb_define_const(mGL,"DEPTH_SIZE",INT2NUM(SDL_GL_DEPTH_SIZE));
+  rb_define_const(mGL,"STENCIL_SIZE",INT2NUM(SDL_GL_STENCIL_SIZE));
+  rb_define_const(mGL,"ACCUM_RED_SIZE",INT2NUM(SDL_GL_ACCUM_RED_SIZE));
+  rb_define_const(mGL,"ACCUM_GREEN_SIZE",INT2NUM(SDL_GL_ACCUM_GREEN_SIZE));
+  rb_define_const(mGL,"ACCUM_BLUE_SIZE",INT2NUM(SDL_GL_ACCUM_BLUE_SIZE));
+  rb_define_const(mGL,"ACCUM_ALPHA_SIZE",INT2NUM(SDL_GL_ACCUM_ALPHA_SIZE));
+}

data/ext/rubygame/rubygame_gl.h

@@ -0,0 +1,32 @@
+/*
+ * Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+ * Copyright (C) 2004-2007  John Croisant
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _RUBYGAME_GL_H
+#define _RUBYGAME_GL_H
+
+extern VALUE mGL;
+extern void Rubygame_Init_GL();
+extern void Define_GL_Constants();
+
+extern VALUE rbgm_gl_getattrib(VALUE, VALUE);
+extern VALUE rbgm_gl_setattrib(VALUE,VALUE,VALUE);
+extern VALUE rbgm_gl_swapbuffers(VALUE);
+
+#endif

data/ext/rubygame/rubygame_image.c

@@ -0,0 +1,108 @@
+/*
+ *  Interface to SDL_image library, for loading image files to Surfaces.
+ *--
+ *  Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+ *  Copyright (C) 2004-2007  John Croisant
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *++
+ */
+
+#include "rubygame_shared.h"
+#include "rubygame_surface.h"
+#include "rubygame_image.h"
+
+void Rubygame_Init_Image();
+VALUE rbgm_image_load(VALUE, VALUE);
+
+/*
+ *  call-seq:
+ *    Surface.load_image( filename )  ->  Surface
+ *
+ *  Load an image file from the disk to a Surface. If the image has an alpha
+ *  channel (e.g. PNG with transparency), the Surface will as well. If the
+ *  image cannot be loaded (for example if the image format is unsupported),
+ *  will raise SDLError.
+ *
+ *  This method is only usable if Rubygame was compiled with the SDL_image
+ *  library; you can check Rubygame::VERSIONS[:sdl_image] to see if it was.
+ *
+ *  This method takes this argument:
+ *  filename:: a string containing the relative or absolute path to the
+ *             image file. The file must have the proper file extension,
+ *             as it is used to determine image format.
+ *
+ *  These formats may be supported, but some may not be available on a
+ *  particular system.
+ *  BMP:: "Windows Bitmap" format.
+ *  GIF:: "Graphics Interchange Format."
+ *  JPG:: "Independent JPEG Group" format.
+ *  LBM:: "Linear Bitmap" format (?)
+ *  PCX:: "PC Paintbrush" format
+ *  PNG:: "Portable Network Graphics" format.
+ *  PNM:: "Portable Any Map" format. (i.e., PPM, PGM, or PBM)
+ *  TGA:: "Truevision TARGA" format.
+ *  TIF:: "Tagged Image File Format"
+ *  XCF:: "eXperimental Computing Facility" (GIMP native format).
+ *  XPM:: "XPixMap" format.
+ */
+VALUE rbgm_image_load( VALUE class, VALUE filename )
+{
+	char *name;
+	SDL_Surface *surf;
+
+	name = StringValuePtr(filename);
+	surf = IMG_Load( name );
+	if(surf == NULL)
+	{
+		rb_raise(eSDLError,"Couldn't load image `%s': %s", name, IMG_GetError());
+	}
+	return Data_Wrap_Struct( cSurface,0,SDL_FreeSurface,surf );
+}
+
+/* 
+ *  Document-class: Rubygame::Surface
+ *
+ *  Surface represents an image, a block of colored pixels arranged in a 2D grid.
+ *  You can load image files to a new Surface with #load_image, or create
+ *  an empty one with Surface.new and draw shapes on it with #draw_line,
+ *  #draw_circle, and all the rest.
+ *
+ *  One of the most important Surface concepts is #blit, copying image
+ *  data from one Surface onto another. By blitting Surfaces onto the
+ *  Screen (which is a special type of Surface) and then using Screen#update,
+ *  you can make images appear for the player to see.
+ *
+ */
+void Init_rubygame_image()
+{
+
+#if 0
+	mRubygame = rb_define_module("Rubygame");
+	cSurface = rb_define_class_under(mRubygame,"Surface",rb_cObject);
+#endif
+
+	Init_rubygame_shared();
+
+  rb_hash_aset(rb_ivar_get(mRubygame,rb_intern("VERSIONS")),
+               ID2SYM(rb_intern("sdl_image")),
+               rb_ary_new3(3,
+                           INT2NUM(SDL_IMAGE_MAJOR_VERSION),
+                           INT2NUM(SDL_IMAGE_MINOR_VERSION),
+                           INT2NUM(SDL_IMAGE_PATCHLEVEL)));
+
+	/* Image methods */
+	rb_define_singleton_method(cSurface,"load_image",rbgm_image_load,1);
+}

data/ext/rubygame/rubygame_image.h

@@ -0,0 +1,41 @@
+/*
+ * Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+ * Copyright (C) 2004-2007  John Croisant
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _RUBYGAME_IMAGE_H
+#define _RUBYGAME_IMAGE_H
+
+#include "SDL_image.h"
+
+#ifndef SDL_IMAGE_MAJOR_VERSION
+#define SDL_IMAGE_MAJOR_VERSION 0
+#endif
+
+#ifndef SDL_IMAGE_MINOR_VERSION
+#define SDL_IMAGE_MINOR_VERSION 0
+#endif
+
+#ifndef SDL_IMAGE_PATCHLEVEL
+#define SDL_IMAGE_PATCHLEVEL 0
+#endif
+
+extern void Init_rubygame_image();
+extern VALUE rbgm_image_load(VALUE, VALUE);
+
+#endif

data/ext/rubygame/rubygame_joystick.c

@@ -0,0 +1,247 @@
+/*--
+ *
+ *	Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+ *	Copyright (C) 2004-2007  John Croisant
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *++
+ */
+
+#include "rubygame_shared.h"
+#include "rubygame_joystick.h"
+
+void Rubygame_Init_Joystick();
+VALUE cJoy;
+
+VALUE rbgm_joy_numjoysticks(VALUE);
+VALUE rbgm_joy_getname(VALUE, VALUE);
+
+VALUE rbgm_joystick_new(VALUE, VALUE);
+
+VALUE rbgm_joystick_index(VALUE);
+VALUE rbgm_joystick_name(VALUE);
+VALUE rbgm_joystick_numaxes(VALUE);
+VALUE rbgm_joystick_numballs(VALUE);
+VALUE rbgm_joystick_numhats(VALUE);
+VALUE rbgm_joystick_numbuttons(VALUE);
+
+
+/* 
+ *  call-seq:
+ *    num_joysticks  ->  Integer
+ *
+ *  Returns the total number of joysticks detected on the system.
+ */
+VALUE rbgm_joy_numjoysticks( VALUE module )
+{
+	return INT2FIX(SDL_NumJoysticks());
+}
+
+/* 
+ *  call-seq:
+ *    get_name( n )  ->  String
+ *
+ *  Returns the name of nth joystick on the system, up to 1024 
+ *  characters long. The name is implementation-dependent.
+ *  See also #name().
+ */
+VALUE rbgm_joy_getname( VALUE module, VALUE joynum )
+{
+	return rb_str_new2(SDL_JoystickName(NUM2INT(joynum)));
+}
+
+
+/*
+* Internal function to safely deallocate the joystick, that is,
+*  only if SDL Joystick module is still initialised.
+*/
+static void RBGM_JoystickClose(SDL_Joystick *joy) 
+{
+	if(SDL_WasInit(SDL_INIT_JOYSTICK)) 
+	{
+		SDL_JoystickClose(joy);
+	}
+}
+
+
+/* 
+ *  call-seq:
+ *    new( n )  ->  Joystick
+ *
+ *  Create and initialize an interface to the nth joystick on the
+ *  system. Raises SDLError if the joystick could not be opened.
+ */
+VALUE rbgm_joystick_new( VALUE module, VALUE vindex )
+{
+	VALUE self;
+	SDL_Joystick *joy;
+	int index;
+
+	index = NUM2INT(vindex);
+
+	joy = SDL_JoystickOpen(index);
+	if(joy == NULL)
+	{
+		rb_raise(eSDLError,"Could not open joystick %d: %s",\
+			index,SDL_GetError());
+	}
+	self = Data_Wrap_Struct(cJoy, 0, RBGM_JoystickClose, joy);
+	return self;
+}
+
+/* 
+ *  call-seq:
+ *    index  ->  Integer
+ *
+ *  Returns the index number of the Joystick, i.e. the identifier number of the
+ *  joystick that this interface controls. This is the same number that was
+ *  given to #new().
+ */
+VALUE rbgm_joystick_index( VALUE self )
+{
+	SDL_Joystick *joy;
+
+	Data_Get_Struct(self,SDL_Joystick,joy);
+	return INT2FIX(SDL_JoystickIndex(joy));
+}
+
+/* 
+ *  call-seq:
+ *    name  ->  String
+ *
+ *  Returns a String containing the name of the Joystick, up to 1024
+ *  characters long. The name is implementation-dependent. See also 
+ *  #get_name().
+ */
+VALUE rbgm_joystick_name( VALUE self )
+{
+	char *name;
+	SDL_Joystick *joy;
+	Uint8 index;
+	int n;
+	int size = 1024;
+
+	Data_Get_Struct(self,SDL_Joystick,joy);
+	index = SDL_JoystickIndex(joy);
+	name = (char *)malloc(size);
+	n = snprintf(name,size,"%s",SDL_JoystickName(index));
+	return rb_str_new(name,n);
+}
+
+/* 
+ *  call-seq:
+ *    axes  ->  Integer
+ *
+ *  Returns the number of axes (singular: axis) featured on the Joystick. Each
+ *  control stick generally has two axes (X and Y), although there are other
+ *  types of controls which are represented as one or more axes. See also
+ *  #axis_state().
+ */
+VALUE rbgm_joystick_numaxes( VALUE self )
+{
+	SDL_Joystick *joy;
+	Data_Get_Struct(self,SDL_Joystick,joy);
+	return INT2FIX(SDL_JoystickNumAxes(joy));
+}
+
+/* 
+ *  call-seq:
+ *    balls  ->  Integer
+ *
+ *  Returns the number of trackballs featured on the Joystick. A trackball is
+ *  usually a small sphere which can be rotated in-place in any direction,
+ *  registering relative movement along two axes. See alse #ball_state().
+ */
+VALUE rbgm_joystick_numballs( VALUE self )
+{
+	SDL_Joystick *joy;
+	Data_Get_Struct(self,SDL_Joystick,joy);
+	return INT2FIX(SDL_JoystickNumBalls(joy));
+}
+
+/* 
+ *  call-seq:
+ *    hats  ->  Integer
+ *
+ *  Returns the number of hats featured on the Joystick. A hat is a switch
+ *  which can be pushed in one of several directions, or centered. See also
+ *  #hat_state().
+ */
+VALUE rbgm_joystick_numhats( VALUE self )
+{
+	SDL_Joystick *joy;
+	Data_Get_Struct(self,SDL_Joystick,joy);
+	return INT2FIX(SDL_JoystickNumHats(joy));
+}
+
+/* 
+ *  call-seq:
+ *    buttons  ->  Integer
+ *
+ *  Returns the number of buttons featured on the Joystick. A button can
+ *  be in one of two states: neutral, or pushed. See also #button_state()
+ */
+VALUE rbgm_joystick_numbuttons( VALUE self )
+{
+	SDL_Joystick *joy;
+	Data_Get_Struct(self,SDL_Joystick,joy);
+  SDL_JoystickUpdate();
+	return INT2FIX(SDL_JoystickNumButtons(joy));
+}
+
+
+/*  Document-class: Rubygame::Joystick
+ *
+ *  The Joystick class interfaces with joysticks, gamepads, and other
+ *  similar hardware devices, commonly used to play games. Each joystick can
+ *  offer 0 or more #axes, #balls, #hats, and/or #buttons.
+ *
+ *  After a Joystick object is successfully created, events for that
+ *  Joystick will begin appearing on the Queue, reporting any state change
+ *  that occurs. Some examples of state changes are a button being pressed
+ *  or released, or a control stick being moved (resulting in one or more axes
+ *  being changed).
+ *
+ *  The full list of Joystick-related events is as follows:
+ *  - JoyAxisEvent
+ *  - JoyBallEvent
+ *  - JoyHatEvent
+ *  - JoyDownEvent
+ *  - JoyUpEvent
+ *
+ *  In future versions of Rubygame, it will be possible to directly query
+ *  the state each joystick. However, it is recommended that you use the
+ *  event system for most cases, so you might as well get used to it!
+ *
+ */
+void Rubygame_Init_Joystick()
+{
+#if 0
+	mRubygame = rb_define_module("Rubygame");
+#endif
+
+	cJoy = rb_define_class_under(mRubygame,"Joystick",rb_cObject);
+	rb_define_singleton_method(cJoy,"num_joysticks",rbgm_joy_numjoysticks,0);
+	rb_define_singleton_method(cJoy,"get_name",rbgm_joy_getname,1);
+
+	rb_define_singleton_method(cJoy,"new",rbgm_joystick_new,1);
+	rb_define_method(cJoy,"index",rbgm_joystick_index,0);
+	rb_define_method(cJoy,"name",rbgm_joystick_name,0);
+	rb_define_method(cJoy,"axes",rbgm_joystick_numaxes,0);
+	rb_define_method(cJoy,"balls",rbgm_joystick_numballs,0);
+	rb_define_method(cJoy,"hats",rbgm_joystick_numhats,0);
+	rb_define_method(cJoy,"buttons",rbgm_joystick_numbuttons,0);
+}