--- deliantra/Deliantra-Client/Client.xs	2007/08/19 12:56:24	1.230
+++ deliantra/Deliantra-Client/Client.xs	2007/10/08 16:10:14	1.236
@@ -442,6 +442,17 @@
   return n + 1;
 }
 
+static unsigned int
+popcount (unsigned int n)
+{
+  n -=  (n >> 1) & 0x55555555U;
+  n  = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
+  n  = ((n >> 4) + n) & 0x0f0f0f0fU;
+  n *= 0x01010101U;
+
+  return n >> 24;
+}
+
 /* SDL should provide this, really. */
 #define SDLK_MODIFIER_MIN 300
 #define SDLK_MODIFIER_MAX 314
@@ -527,6 +538,8 @@
         const_iv (SDL_APPMOUSEFOCUS),
         const_iv (SDL_APPACTIVE),
 
+	const_iv (SDLK_FIRST),
+	const_iv (SDLK_LAST),
 	const_iv (SDLK_KP0),
 	const_iv (SDLK_KP1),
 	const_iv (SDLK_KP2),
@@ -608,6 +621,8 @@
 	const_iv (KMOD_NUM),
 	const_iv (KMOD_CAPS),
 	const_iv (KMOD_MODE),
+
+        const_iv (MIX_DEFAULT_FORMAT),
 #	undef const_iv
   };
     
@@ -635,6 +650,10 @@
 
 NV ceil (NV x)
 
+IV minpot (UV n)
+
+IV popcount (UV n)
+
 void
 pango_init ()
 	CODE:
@@ -813,12 +832,28 @@
 }
 
 int
-Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
+Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
   	POSTCALL:
         Mix_HookMusicFinished (music_finished);
         Mix_ChannelFinished (channel_finished);
 
 void
+Mix_QuerySpec ()
+	PPCODE:
+{
+	int freq, channels;
+        Uint16 format;
+
+        if (Mix_QuerySpec (&freq, &format, &channels))
+          {
+            EXTEND (SP, 3);
+            PUSHs (sv_2mortal (newSViv (freq)));
+            PUSHs (sv_2mortal (newSViv (format)));
+            PUSHs (sv_2mortal (newSViv (channels)));
+          }
+}
+
+void
 Mix_CloseAudio ()
 
 int
@@ -1348,8 +1383,6 @@
 
 PROTOTYPES: ENABLE
 
-int minpot (int n)
-
 void
 pad (SV *data_, int ow, int oh, int nw, int nh)
 	CODE:
@@ -2605,6 +2638,7 @@
         const_iv (GL_LINE_SMOOTH_HINT),
         const_iv (GL_POLYGON_SMOOTH_HINT),
         const_iv (GL_GENERATE_MIPMAP_HINT),
+        const_iv (GL_TEXTURE_COMPRESSION_HINT),
         const_iv (GL_FASTEST),
         const_iv (GL_DONT_CARE),
         const_iv (GL_NICEST),
@@ -2622,6 +2656,12 @@
   AvREAL_off (texture_av);
 }
 
+void
+disable_GL_EXT_blend_func_separate ()
+	CODE:
+        gl.BlendFuncSeparate    = 0;
+        gl.BlendFuncSeparateEXT = 0;
+
 char *
 gl_vendor ()
 	CODE:
@@ -2752,6 +2792,15 @@
 	CODE:
         glRectf (x1, y1, x2, y2);
 
+void glRect_lineloop (float x1, float y1, float x2, float y2)
+	CODE:
+	glBegin (GL_LINE_LOOP);
+	glVertex2f (x1, y1);
+	glVertex2f (x2, y1);
+	glVertex2f (x2, y2);
+	glVertex2f (x1, y2);
+	glEnd ();
+
 PROTOTYPES: ENABLE
 
 void glBegin (int mode)
@@ -2913,19 +2962,17 @@
               }
           }
 #if 0
-   if ($ENV{CFPLUS_DEBUG} & 1) {
-      glPushMatrix;
-      glColor 1, 1, 0, 1;
-      glTranslate 0.375, 0.375;
-      glBegin GL_LINE_LOOP;
-      glVertex 0             , 0;
-      glVertex $self->{w} - 1, 0;
-      glVertex $self->{w} - 1, $self->{h} - 1;
-      glVertex 0             , $self->{h} - 1;
-      glEnd;
-      glPopMatrix;
-      #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
-   }
+        // draw borders, for debugging
+        glPushMatrix ();
+        glColor4f (1., 1., 0., 1.);
+        glTranslatef (.5, .5, 0.);
+        glBegin (GL_LINE_LOOP);
+        glVertex2f (0    , 0);
+        glVertex2f (w - 1, 0);
+        glVertex2f (w - 1, h - 1);
+        glVertex2f (0    , h - 1);
+        glEnd ();
+        glPopMatrix ();
 #endif
 	PUSHMARK (SP);
         XPUSHs (self);