--- deliantra/Deliantra-Client/Client.xs	2008/07/20 02:55:36	1.267
+++ deliantra/Deliantra-Client/Client.xs	2008/09/01 06:18:09	1.277
@@ -41,6 +41,11 @@
 #include <SDL_mixer.h>
 #include <SDL_opengl.h>
 
+/* work around os x broken headers */
+#ifdef __MACOSX__
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
 #define PANGO_ENABLE_BACKEND
 #define G_DISABLE_CAST_CHECKS
 
@@ -88,6 +93,8 @@
 /* mask out modifiers we are not interested in */
 #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
 
+#define KMOD_LRAM 0x10000 // our extension
+
 static AV *texture_av;
 
 static struct
@@ -371,6 +378,8 @@
 
 #define CELL_CLEAR(cell)	\
   do {				\
+    if ((cell)->player)		\
+      (cell)->tile [2] = 0;	\
     (cell)->darkness = 0;	\
     (cell)->stat_hp  = 0;	\
     (cell)->flags    = 0;	\
@@ -522,6 +531,58 @@
   return 1;
 }
 
+/******************************************************************************/
+
+/* process keyboard modifiers */
+static int
+mod_munge (int mod)
+{
+  mod &= MOD_MASK;
+
+  if (mod & (KMOD_META | KMOD_ALT))
+    mod |= KMOD_LRAM;
+
+  return mod;
+}
+
+static void
+deliantra_main ()
+{
+  char *argv[] = { 0 };
+  call_argv ("::main", G_DISCARD | G_VOID, argv);
+}
+
+#ifdef __MACOSX__
+  /* to due surprising braindamage on the side of SDL design, we
+   * do some mind-boggling hack here: SDL requires a custom main()
+   * on OS X, so... we provide one and call the original main(), which,
+   * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
+   * and which calls our main (== SDL_main) back.
+   */
+  extern C_LINKAGE int
+  main (int argc, char *argv[])
+  {
+    deliantra_main ();
+  }
+
+  #undef main
+
+  extern C_LINKAGE int main (int argc, char *argv[]);
+
+  static void
+  SDL_braino (void)
+  {
+    char *argv[] = { "deliantra client", 0 };
+    (main) (1, argv);
+  }
+#else
+  static void
+  SDL_braino (void)
+  {
+    deliantra_main ();
+  }
+#endif
+
 MODULE = Deliantra::Client	PACKAGE = DC
 
 PROTOTYPES: ENABLE
@@ -560,6 +621,56 @@
         const_iv (SDL_APPMOUSEFOCUS),
         const_iv (SDL_APPACTIVE),
 
+
+        const_iv (SDLK_UNKNOWN),
+        const_iv (SDLK_FIRST),
+        const_iv (SDLK_BACKSPACE),
+        const_iv (SDLK_TAB),
+        const_iv (SDLK_CLEAR),
+        const_iv (SDLK_RETURN),
+        const_iv (SDLK_PAUSE),
+        const_iv (SDLK_ESCAPE),
+        const_iv (SDLK_SPACE),
+        const_iv (SDLK_EXCLAIM),
+        const_iv (SDLK_QUOTEDBL),
+        const_iv (SDLK_HASH),
+        const_iv (SDLK_DOLLAR),
+        const_iv (SDLK_AMPERSAND),
+        const_iv (SDLK_QUOTE),
+        const_iv (SDLK_LEFTPAREN),
+        const_iv (SDLK_RIGHTPAREN),
+        const_iv (SDLK_ASTERISK),
+        const_iv (SDLK_PLUS),
+        const_iv (SDLK_COMMA),
+        const_iv (SDLK_MINUS),
+        const_iv (SDLK_PERIOD),
+        const_iv (SDLK_SLASH),
+        const_iv (SDLK_0),
+        const_iv (SDLK_1),
+        const_iv (SDLK_2),
+        const_iv (SDLK_3),
+        const_iv (SDLK_4),
+        const_iv (SDLK_5),
+        const_iv (SDLK_6),
+        const_iv (SDLK_7),
+        const_iv (SDLK_8),
+        const_iv (SDLK_9),
+        const_iv (SDLK_COLON),
+        const_iv (SDLK_SEMICOLON),
+        const_iv (SDLK_LESS),
+        const_iv (SDLK_EQUALS),
+        const_iv (SDLK_GREATER),
+        const_iv (SDLK_QUESTION),
+        const_iv (SDLK_AT),
+
+        const_iv (SDLK_LEFTBRACKET),
+        const_iv (SDLK_BACKSLASH),
+        const_iv (SDLK_RIGHTBRACKET),
+        const_iv (SDLK_CARET),
+        const_iv (SDLK_UNDERSCORE),
+        const_iv (SDLK_BACKQUOTE),
+        const_iv (SDLK_DELETE),
+
 	const_iv (SDLK_FIRST),
 	const_iv (SDLK_LAST),
 	const_iv (SDLK_KP0),
@@ -644,6 +755,8 @@
 	const_iv (KMOD_CAPS),
 	const_iv (KMOD_MODE),
 
+        const_iv (KMOD_LRAM),
+
         const_iv (MIX_DEFAULT_FORMAT),
 
 	const_iv (SDL_INIT_TIMER),
@@ -671,7 +784,9 @@
         const_iv (SDL_GL_MULTISAMPLEBUFFERS),
         const_iv (SDL_GL_MULTISAMPLESAMPLES),
         const_iv (SDL_GL_ACCELERATED_VISUAL),
-        const_iv (SDL_GL_SWAP_CONTROL)
+        const_iv (SDL_GL_SWAP_CONTROL),
+
+        const_iv (FOW_DARKNESS)
 #	undef const_iv
   };
     
@@ -719,6 +834,8 @@
 
 char *SDL_GetError ()
 
+void SDL_braino ()
+
 int SDL_Init (U32 flags)
 
 int SDL_InitSubSystem (U32 flags)
@@ -836,8 +953,8 @@
                 case SDL_KEYUP:
                   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 & MOD_MASK), 0);
-                  hv_store (hv, "cmod",    4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
+                  hv_store (hv, "mod",     3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
+                  hv_store (hv, "cmod",    4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
                   hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
                   break;
 
@@ -865,7 +982,7 @@
                         SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
                       }
 
-                    hv_store (hv, "mod",    3, newSViv (SDL_GetModState () & MOD_MASK), 0);
+                    hv_store (hv, "mod",    3, newSViv (mod_munge (SDL_GetModState ())), 0);
                     hv_store (hv, "state",  5, newSViv (state), 0);
                     hv_store (hv, "x",      1, newSViv (x), 0);
                     hv_store (hv, "y",      1, newSViv (y), 0);
@@ -2234,7 +2351,7 @@
         mx += self->x - 1;
         my += self->y - 1;
 
-        memset (darkness1, 255, sw1 * sh1);
+        memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
 
         for (y = 0; y < sh1; y++)
           if (0 <= y + my && y + my < self->rows)