--- deliantra/Deliantra-Client/Client.xs	2007/08/21 02:39:17	1.233
+++ deliantra/Deliantra-Client/Client.xs	2007/08/28 01:23:47	1.235
@@ -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),
@@ -635,6 +648,10 @@
 
 NV ceil (NV x)
 
+IV minpot (UV n)
+
+IV popcount (UV n)
+
 void
 pango_init ()
 	CODE:
@@ -1348,8 +1365,6 @@
 
 PROTOTYPES: ENABLE
 
-int minpot (int n)
-
 void
 pad (SV *data_, int ow, int oh, int nw, int nh)
 	CODE:
@@ -2929,19 +2944,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);