--- deliantra/Deliantra-Client/Client.xs	2006/11/07 22:41:27	1.164
+++ deliantra/Deliantra-Client/Client.xs	2007/04/01 01:19:18	1.171
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 # define WIN32_LEAN_AND_MEAN
-# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
+# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
 # include <malloc.h>
 # include <windows.h>
 # include <wininet.h>
@@ -16,6 +16,7 @@
 # undef pipe
 #endif
 
+#include <assert.h>
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
@@ -361,6 +362,10 @@
   return n + 1;
 }
 
+/* SDL should provide this, really. */
+#define SDLK_MODIFIER_MIN 300
+#define SDLK_MODIFIER_MAX 314
+
 MODULE = CFPlus	PACKAGE = CFPlus
 
 PROTOTYPES: ENABLE
@@ -373,6 +378,9 @@
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
+        const_iv (SDLK_MODIFIER_MIN),
+        const_iv (SDLK_MODIFIER_MAX),
+
 	const_iv (SDL_ACTIVEEVENT),
 	const_iv (SDL_KEYDOWN),
 	const_iv (SDL_KEYUP),
@@ -391,6 +399,11 @@
 	const_iv (SDL_VIDEORESIZE),
 	const_iv (SDL_VIDEOEXPOSE),
         const_iv (SDL_USEREVENT),
+
+        const_iv (SDL_APPINPUTFOCUS),
+        const_iv (SDL_APPMOUSEFOCUS),
+        const_iv (SDL_APPACTIVE),
+
 	const_iv (SDLK_KP0),
 	const_iv (SDLK_KP1),
 	const_iv (SDLK_KP2),
@@ -455,29 +468,39 @@
 	const_iv (SDLK_POWER),
 	const_iv (SDLK_EURO),
 	const_iv (SDLK_UNDO),
+
 	const_iv (KMOD_NONE),
+	const_iv (KMOD_SHIFT),
 	const_iv (KMOD_LSHIFT),
 	const_iv (KMOD_RSHIFT),
+	const_iv (KMOD_CTRL),
 	const_iv (KMOD_LCTRL),
 	const_iv (KMOD_RCTRL),
+	const_iv (KMOD_ALT),
 	const_iv (KMOD_LALT),
 	const_iv (KMOD_RALT),
+	const_iv (KMOD_META),
 	const_iv (KMOD_LMETA),
 	const_iv (KMOD_RMETA),
 	const_iv (KMOD_NUM),
 	const_iv (KMOD_CAPS),
 	const_iv (KMOD_MODE),
-	const_iv (KMOD_CTRL),
-	const_iv (KMOD_SHIFT),
-	const_iv (KMOD_ALT),
-	const_iv (KMOD_META)
 #	undef const_iv
   };
     
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
     newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
+
+  assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
+  assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
 }
 
+void
+weaken (SV *rv)
+	PROTOTYPE: $
+	CODE:
+        sv_rvweaken (rv);
+
 int
 in_destruct ()
 	CODE:
@@ -589,6 +612,7 @@
                   hv_store (hv, "state",   5, newSViv (ev.key.state), 0);
                   hv_store (hv, "sym",     3, newSViv (ev.key.keysym.sym), 0);
                   hv_store (hv, "mod",     3, newSViv (ev.key.keysym.mod), 0);
+                  hv_store (hv, "cmod",    4, newSViv (SDL_GetModState ()), 0); /* current mode */
                   hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
                   break;
 
@@ -1051,7 +1075,7 @@
 {
 	int index, trailing;
         pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
-        RETVAL = index;
+        RETVAL = index + trailing;
 }
 	OUTPUT:
         RETVAL
@@ -1070,6 +1094,45 @@
 }
 
 void
+index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
+	PPCODE:
+{
+	int line, x;
+
+	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
+        /* pango bug: line is between 1..numlines, not 0..numlines-1 */
+
+        EXTEND (SP, 2);
+        PUSHs (sv_2mortal (newSViv (line - 1)));
+        PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
+}
+
+void
+line_x_to_index (CFPlus::Layout self, int line, int x)
+	PPCODE:
+{
+	PangoLayoutLine *lp;
+        int index, trailing;
+
+        if (line < 0)
+          XSRETURN_EMPTY;
+
+        if (!(lp = pango_layout_get_line (self->pl, line)))
+          XSRETURN_EMPTY; /* do better */
+
+        pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
+
+        EXTEND (SP, 2);
+        if (GIMME_V == G_SCALAR)
+          PUSHs (sv_2mortal (newSViv (index + trailing)));
+        else
+          {
+            PUSHs (sv_2mortal (newSViv (index)));
+            PUSHs (sv_2mortal (newSViv (trailing)));
+          }
+}
+
+void
 render (CFPlus::Layout self, float x, float y, int flags = 0)
 	PPCODE:
         pango_opengl_render_layout_subpixel (
@@ -1351,10 +1414,10 @@
                               }
                             else if (cmd == 6) // monster width
                               cell->stat_width = *data++ + 1;
-                            else if (cmd == 0x47) // monster width
+                            else if (cmd == 0x47)
                               {
-                                if (*data == 4)
-                                  ; // decode player tag
+                                if (*data == 8)
+                                  ; // decode player uuid
 
                                 data += *data + 1;
                               }
@@ -1452,7 +1515,7 @@
         RETVAL
 
 void
-draw (CFPlus::Map self, int mx, int my, int sw, int sh)
+draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
 	CODE:
 {
         int x, y, z;
@@ -1489,8 +1552,8 @@
                       if (face && face < self->texs)
                         {
                           maptex tex = self->tex [face];
-                          int px = (x + 1) * 32 - tex.w;
-                          int py = (y + 1) * 32 - tex.h;
+                          int px = (x + 1) * T - tex.w;
+                          int py = (y + 1) * T - tex.h;
 
                           if (last_name != tex.name)
                             {
@@ -1510,8 +1573,8 @@
                           if (cell->flags & 1)
                             {
                               maptex tex = self->tex [1];
-                              int px = (x + 1) * 32 - tex.w + 2;
-                              int py = (y + 1) * 32 - tex.h - 6;
+                              int px = (x + 1) * T - tex.w + 2;
+                              int py = (y + 1) * T - tex.h - 6;
 
                               glEnd ();
                               glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
@@ -1542,12 +1605,12 @@
                   {
                     mapcell *cell = row->col + (x + mx - row->c0);
 
-                    int px = x * 32;
-                    int py = y * 32;
+                    int px = x * T;
+                    int py = y * T;
 
                     if (cell->stat_hp)
                       {
-                        int width = cell->stat_width * 32;
+                        int width = cell->stat_width * T;
                         int thick = sh / 28 + 1 + cell->stat_width;
 
                         glColor3ub (0,  0,  0);