]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
set eol-style property
authorres <res@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 16 Jan 2008 11:20:50 +0000 (11:20 +0000)
committerres <res@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 16 Jan 2008 11:20:50 +0000 (11:20 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7968 d7cf8633-e32d-0410-b094-e92efae38249

cl_gecko.c

index db80596d7815361bf9148129021d447a9994009a..cf17d5a5bd97e339ea72a1375b6725a5e6518103 100644 (file)
-/* --- 8< --- 8< ---   OffscreenGecko headers   --- >8 --- >8 --- */\r
-\r
-/* OffscreenGecko/defs.h */\r
-\r
-#define OSGK_CLASSTYPE_DEF     struct\r
-#define OSGK_CLASSTYPE_REF     struct\r
-\r
-#include <assert.h>\r
-#define OSGK_ASSERT(x) assert(x)\r
-\r
-typedef unsigned int OSGK_GeckoResult;\r
-\r
-#if defined(__cplusplus) || defined(__GNUC__)\r
-#  define OSGK_INLINE  inline\r
-#elif defined(_MSC_VER)\r
-#  define OSGK_INLINE  __inline\r
-#else\r
-#  define OSGK_INLINE\r
-#endif\r
-\r
-/* OffscreenGecko/baseobj.h */\r
-\r
-struct OSGK_BaseObject_s\r
-{\r
-  int reserved;\r
-};\r
-typedef struct OSGK_BaseObject_s OSGK_BaseObject;\r
-\r
-#define OSGK_DERIVEDTYPE(T)           \\r
-  typedef struct T ## _s {            \\r
-    OSGK_BaseObject baseobj;          \\r
-  } T\r
-\r
-static int (*osgk_addref) (OSGK_BaseObject* obj);\r
-static int (*osgk_release) (OSGK_BaseObject* obj);\r
-\r
-static OSGK_INLINE int osgk_addref_real (OSGK_BaseObject* obj)\r
-{\r
-  return osgk_addref (obj);\r
-}\r
-\r
-static OSGK_INLINE int osgk_release_real (OSGK_BaseObject* obj)\r
-{\r
-  return osgk_release (obj);\r
-}\r
-\r
-#define osgk_addref(obj)    osgk_addref_real (&((obj)->baseobj))\r
-#define osgk_release(obj)   osgk_release_real (&((obj)->baseobj))\r
-\r
-/* OffscreenGecko/embedding.h */\r
-\r
-OSGK_DERIVEDTYPE(OSGK_EmbeddingOptions);\r
-\r
-static OSGK_EmbeddingOptions* (*osgk_embedding_options_create) (void);\r
-static void (*osgk_embedding_options_add_search_path) (\r
-  OSGK_EmbeddingOptions* options, const char* path);\r
-/*static void (*osgk_embedding_options_add_components_path) (\r
-  OSGK_EmbeddingOptions* options, const char* path);*/\r
-static void (*osgk_embedding_options_set_profile_dir) (\r
-  OSGK_EmbeddingOptions* options, const char* profileDir,\r
-  const char* localProfileDir);\r
-\r
-OSGK_DERIVEDTYPE(OSGK_Embedding);\r
-\r
-#define OSGK_API_VERSION    1\r
-\r
-static OSGK_Embedding* (*osgk_embedding_create2) (\r
-  unsigned int apiVer, OSGK_EmbeddingOptions* options, \r
-  OSGK_GeckoResult* geckoResult);\r
-\r
-static OSGK_INLINE OSGK_Embedding* osgk_embedding_create (\r
-  OSGK_GeckoResult* geckoResult)\r
-{\r
-  return osgk_embedding_create2 (OSGK_API_VERSION, 0, geckoResult);\r
-}\r
-\r
-static OSGK_INLINE OSGK_Embedding* osgk_embedding_create_with_options (\r
-  OSGK_EmbeddingOptions* options, OSGK_GeckoResult* geckoResult)\r
-{\r
-  return osgk_embedding_create2 (OSGK_API_VERSION, options, geckoResult);\r
-}\r
-\r
-/*static OSGK_GeckoMem* (*osgk_embedding_get_gecko_mem) (\r
-  OSGK_Embedding* embedding);*/\r
-\r
-/*static OSGK_ComponentMgr* (*osgk_embedding_get_component_mgr) (\r
-  OSGK_Embedding* embedding);*/\r
-\r
-/*OSGK_CLASSTYPE_DEF nsIComponentManager;\r
-OSGK_CLASSTYPE_DEF nsIComponentRegistrar;\r
-OSGK_CLASSTYPE_DEF nsIServiceManager;*/\r
-\r
-/*static OSGK_CLASSTYPE_REF nsIComponentManager* \r
-(*osgk_embedding_get_gecko_component_manager) (OSGK_Embedding* embedding);*/\r
-/*static OSGK_CLASSTYPE_REF nsIComponentRegistrar* \r
-(*osgk_embedding_get_gecko_component_registrar) (OSGK_Embedding* embedding);*/\r
-/*static OSGK_CLASSTYPE_REF nsIServiceManager* \r
-(*osgk_embedding_get_gecko_service_manager) (OSGK_Embedding* embedding);*/\r
-\r
-enum\r
-{\r
-  jsgPrivileged = 1\r
-};\r
-/*static int (*osgk_embedding_register_js_global) (\r
-  OSGK_Embedding* embedding, const char* name, const char* contractID,\r
-  unsigned int flags, OSGK_String** previousContract,\r
-  OSGK_GeckoResult* geckoResult);*/\r
-\r
-/*static void (*osgk_embedding_clear_focus*) (OSGK_Embedding* embedding);*/\r
-/*void (*osgk_embedding_set_auto_focus) (OSGK_Embedding* embedding, int autoFocus);*/\r
-/*static int (*osgk_embedding_get_auto_focus) (OSGK_Embedding* embedding);*/\r
-\r
-/* OffscreenGecko/browser.h */\r
-OSGK_DERIVEDTYPE(OSGK_Browser);\r
-\r
-static OSGK_Browser* (*osgk_browser_create) (\r
-  OSGK_Embedding* embedding, int width, int height);\r
-static void (*osgk_browser_navigate) (OSGK_Browser* browser,\r
-  const char* uri);\r
-\r
-static int (*osgk_browser_query_dirty) (OSGK_Browser* browser);\r
-static const unsigned char* (*osgk_browser_lock_data) (\r
-  OSGK_Browser* browser, int* isDirty);\r
-static void (*osgk_browser_unlock_data) (OSGK_Browser* browser,\r
-  const unsigned char* data);\r
-\r
-typedef enum OSGK_MouseButton\r
-{\r
-  mbLeft, \r
-  mbRight, \r
-  mbMiddle\r
-} OSGK_MouseButton;\r
-\r
-typedef enum OSGK_MouseButtonEventType\r
-{\r
-  meDown,\r
-  meUp,\r
-  meDoubleClick\r
-} OSGK_MouseButtonEventType;\r
-\r
-static void (*osgk_browser_event_mouse_move) (\r
-  OSGK_Browser* browser, int x, int y);\r
-static void (*osgk_browser_event_mouse_button) (\r
-  OSGK_Browser* browser, OSGK_MouseButton button, \r
-  OSGK_MouseButtonEventType eventType);\r
-\r
-typedef enum OSGK_WheelAxis\r
-{\r
-  waVertical,\r
-  waHorizontal\r
-} OSGK_WheelAxis;\r
-\r
-typedef enum OSGK_WheelDirection\r
-{\r
-  wdPositive,\r
-  wdNegative,\r
-  wdPositivePage,\r
-  wdNegativePage\r
-} OSGK_WheelDirection;\r
-\r
-static void (*osgk_browser_event_mouse_wheel) (\r
-  OSGK_Browser* browser, OSGK_WheelAxis axis, \r
-  OSGK_WheelDirection direction);\r
-\r
-typedef enum OSGK_KeyboardEventType\r
-{\r
-  keDown,\r
-  keUp,\r
-  kePress\r
-} OSGK_KeyboardEventType;\r
-\r
-enum\r
-{\r
-  OSGKKey_First = 0x110000,\r
-\r
-  OSGKKey_Backspace = OSGKKey_First,\r
-  OSGKKey_Tab,\r
-  OSGKKey_Return,\r
-  OSGKKey_Shift,\r
-  OSGKKey_Control,\r
-  OSGKKey_Alt,\r
-  OSGKKey_CapsLock,\r
-  OSGKKey_Escape,\r
-  OSGKKey_Space,\r
-  OSGKKey_PageUp,\r
-  OSGKKey_PageDown,\r
-  OSGKKey_End,\r
-  OSGKKey_Home,\r
-  OSGKKey_Left,\r
-  OSGKKey_Up,\r
-  OSGKKey_Right,\r
-  OSGKKey_Down,\r
-  OSGKKey_Insert,\r
-  OSGKKey_Delete,\r
-  OSGKKey_F1,\r
-  OSGKKey_F2,\r
-  OSGKKey_F3,\r
-  OSGKKey_F4,\r
-  OSGKKey_F5,\r
-  OSGKKey_F6,\r
-  OSGKKey_F7,\r
-  OSGKKey_F8,\r
-  OSGKKey_F9,\r
-  OSGKKey_F10,\r
-  OSGKKey_F11,\r
-  OSGKKey_F12,\r
-  OSGKKey_NumLock,\r
-  OSGKKey_ScrollLock,\r
-  OSGKKey_Meta\r
-};\r
-\r
-static int (*osgk_browser_event_key) (\r
-  OSGK_Browser* browser, unsigned int key,\r
-  OSGK_KeyboardEventType eventType);\r
-\r
-typedef enum OSGK_AntiAliasType\r
-{\r
-  aaNone,\r
-  aaGray,\r
-  aaSubpixel\r
-} OSGK_AntiAliasType;\r
-\r
-/*static void (*osgk_browser_set_antialias) (\r
-  OSGK_Browser* browser, OSGK_AntiAliasType aaType);*/\r
-/*static OSGK_AntiAliasType (*osgk_browser_get_antialias) (OSGK_Browser* browser);*/\r
-\r
-/*static void (*osgk_browser_focus) (OSGK_Browser* browser);*/\r
-\r
-static void (*osgk_browser_resize) (OSGK_Browser* browser,\r
-  int width, int height);\r
-\r
-/* --- >8 --- >8 --- End OffscreenGecko headers --- 8< --- 8< --- */\r
-\r
-#include "quakedef.h"\r
-#include "cl_dyntexture.h"\r
-#include "cl_gecko.h"\r
-#include "timing.h"\r
-\r
-#define DEFAULT_GECKO_SIZE       512\r
-\r
-static rtexturepool_t *cl_geckotexturepool;\r
-static OSGK_Embedding *cl_geckoembedding;\r
-\r
-struct clgecko_s {\r
-       qboolean active;\r
-       char name[ MAX_QPATH + 32 ];\r
-\r
-       OSGK_Browser *browser;\r
-       int width, height;\r
-       int texWidth, texHeight;\r
-       \r
-       rtexture_t *texture;\r
-};\r
-\r
-static clgecko_t cl_geckoinstances[ MAX_GECKO_INSTANCES ];\r
-\r
-static dllhandle_t osgk_dll = NULL;\r
-\r
-static clgecko_t * cl_gecko_findunusedinstance( void ) {\r
-       int i;\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( !instance->active ) {\r
-                       return instance;\r
-               }\r
-       }\r
-       if( developer.integer > 0 ) {\r
-               Con_Printf( "cl_gecko_findunusedinstance: out of geckos\n" );\r
-       }\r
-       return NULL;\r
-}\r
-\r
-clgecko_t * CL_Gecko_FindBrowser( const char *name ) {\r
-       int i;\r
-\r
-       if( !name || !*name || strncmp( name, CLGECKOPREFIX, sizeof( CLGECKOPREFIX ) - 1 ) != 0 ) {\r
-               if( developer.integer > 0 ) {\r
-                       Con_Printf( "CL_Gecko_FindBrowser: Bad gecko texture name '%s'!\n", name );\r
-               }\r
-               return NULL;\r
-       }\r
-\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( instance->active && strcmp( instance->name, name ) == 0 ) {\r
-                       return instance;\r
-               }\r
-       }\r
-\r
-       if( developer.integer > 0 ) {\r
-               Con_Printf( "CL_Gecko_FindBrowser: No browser named '%s'!\n", name );\r
-       }\r
-\r
-       return NULL;\r
-}\r
-\r
+/* --- 8< --- 8< ---   OffscreenGecko headers   --- >8 --- >8 --- */
+
+/* OffscreenGecko/defs.h */
+
+#define OSGK_CLASSTYPE_DEF     struct
+#define OSGK_CLASSTYPE_REF     struct
+
+#include <assert.h>
+#define OSGK_ASSERT(x) assert(x)
+
+typedef unsigned int OSGK_GeckoResult;
+
+#if defined(__cplusplus) || defined(__GNUC__)
+#  define OSGK_INLINE  inline
+#elif defined(_MSC_VER)
+#  define OSGK_INLINE  __inline
+#else
+#  define OSGK_INLINE
+#endif
+
+/* OffscreenGecko/baseobj.h */
+
+struct OSGK_BaseObject_s
+{
+  int reserved;
+};
+typedef struct OSGK_BaseObject_s OSGK_BaseObject;
+
+#define OSGK_DERIVEDTYPE(T)           \
+  typedef struct T ## _s {            \
+    OSGK_BaseObject baseobj;          \
+  } T
+
+static int (*osgk_addref) (OSGK_BaseObject* obj);
+static int (*osgk_release) (OSGK_BaseObject* obj);
+
+static OSGK_INLINE int osgk_addref_real (OSGK_BaseObject* obj)
+{
+  return osgk_addref (obj);
+}
+
+static OSGK_INLINE int osgk_release_real (OSGK_BaseObject* obj)
+{
+  return osgk_release (obj);
+}
+
+#define osgk_addref(obj)    osgk_addref_real (&((obj)->baseobj))
+#define osgk_release(obj)   osgk_release_real (&((obj)->baseobj))
+
+/* OffscreenGecko/embedding.h */
+
+OSGK_DERIVEDTYPE(OSGK_EmbeddingOptions);
+
+static OSGK_EmbeddingOptions* (*osgk_embedding_options_create) (void);
+static void (*osgk_embedding_options_add_search_path) (
+  OSGK_EmbeddingOptions* options, const char* path);
+/*static void (*osgk_embedding_options_add_components_path) (
+  OSGK_EmbeddingOptions* options, const char* path);*/
+static void (*osgk_embedding_options_set_profile_dir) (
+  OSGK_EmbeddingOptions* options, const char* profileDir,
+  const char* localProfileDir);
+
+OSGK_DERIVEDTYPE(OSGK_Embedding);
+
+#define OSGK_API_VERSION    1
+
+static OSGK_Embedding* (*osgk_embedding_create2) (
+  unsigned int apiVer, OSGK_EmbeddingOptions* options, 
+  OSGK_GeckoResult* geckoResult);
+
+static OSGK_INLINE OSGK_Embedding* osgk_embedding_create (
+  OSGK_GeckoResult* geckoResult)
+{
+  return osgk_embedding_create2 (OSGK_API_VERSION, 0, geckoResult);
+}
+
+static OSGK_INLINE OSGK_Embedding* osgk_embedding_create_with_options (
+  OSGK_EmbeddingOptions* options, OSGK_GeckoResult* geckoResult)
+{
+  return osgk_embedding_create2 (OSGK_API_VERSION, options, geckoResult);
+}
+
+/*static OSGK_GeckoMem* (*osgk_embedding_get_gecko_mem) (
+  OSGK_Embedding* embedding);*/
+
+/*static OSGK_ComponentMgr* (*osgk_embedding_get_component_mgr) (
+  OSGK_Embedding* embedding);*/
+
+/*OSGK_CLASSTYPE_DEF nsIComponentManager;
+OSGK_CLASSTYPE_DEF nsIComponentRegistrar;
+OSGK_CLASSTYPE_DEF nsIServiceManager;*/
+
+/*static OSGK_CLASSTYPE_REF nsIComponentManager* 
+(*osgk_embedding_get_gecko_component_manager) (OSGK_Embedding* embedding);*/
+/*static OSGK_CLASSTYPE_REF nsIComponentRegistrar* 
+(*osgk_embedding_get_gecko_component_registrar) (OSGK_Embedding* embedding);*/
+/*static OSGK_CLASSTYPE_REF nsIServiceManager* 
+(*osgk_embedding_get_gecko_service_manager) (OSGK_Embedding* embedding);*/
+
+enum
+{
+  jsgPrivileged = 1
+};
+/*static int (*osgk_embedding_register_js_global) (
+  OSGK_Embedding* embedding, const char* name, const char* contractID,
+  unsigned int flags, OSGK_String** previousContract,
+  OSGK_GeckoResult* geckoResult);*/
+
+/*static void (*osgk_embedding_clear_focus*) (OSGK_Embedding* embedding);*/
+/*void (*osgk_embedding_set_auto_focus) (OSGK_Embedding* embedding, int autoFocus);*/
+/*static int (*osgk_embedding_get_auto_focus) (OSGK_Embedding* embedding);*/
+
+/* OffscreenGecko/browser.h */
+OSGK_DERIVEDTYPE(OSGK_Browser);
+
+static OSGK_Browser* (*osgk_browser_create) (
+  OSGK_Embedding* embedding, int width, int height);
+static void (*osgk_browser_navigate) (OSGK_Browser* browser,
+  const char* uri);
+
+static int (*osgk_browser_query_dirty) (OSGK_Browser* browser);
+static const unsigned char* (*osgk_browser_lock_data) (
+  OSGK_Browser* browser, int* isDirty);
+static void (*osgk_browser_unlock_data) (OSGK_Browser* browser,
+  const unsigned char* data);
+
+typedef enum OSGK_MouseButton
+{
+  mbLeft, 
+  mbRight, 
+  mbMiddle
+} OSGK_MouseButton;
+
+typedef enum OSGK_MouseButtonEventType
+{
+  meDown,
+  meUp,
+  meDoubleClick
+} OSGK_MouseButtonEventType;
+
+static void (*osgk_browser_event_mouse_move) (
+  OSGK_Browser* browser, int x, int y);
+static void (*osgk_browser_event_mouse_button) (
+  OSGK_Browser* browser, OSGK_MouseButton button, 
+  OSGK_MouseButtonEventType eventType);
+
+typedef enum OSGK_WheelAxis
+{
+  waVertical,
+  waHorizontal
+} OSGK_WheelAxis;
+
+typedef enum OSGK_WheelDirection
+{
+  wdPositive,
+  wdNegative,
+  wdPositivePage,
+  wdNegativePage
+} OSGK_WheelDirection;
+
+static void (*osgk_browser_event_mouse_wheel) (
+  OSGK_Browser* browser, OSGK_WheelAxis axis, 
+  OSGK_WheelDirection direction);
+
+typedef enum OSGK_KeyboardEventType
+{
+  keDown,
+  keUp,
+  kePress
+} OSGK_KeyboardEventType;
+
+enum
+{
+  OSGKKey_First = 0x110000,
+
+  OSGKKey_Backspace = OSGKKey_First,
+  OSGKKey_Tab,
+  OSGKKey_Return,
+  OSGKKey_Shift,
+  OSGKKey_Control,
+  OSGKKey_Alt,
+  OSGKKey_CapsLock,
+  OSGKKey_Escape,
+  OSGKKey_Space,
+  OSGKKey_PageUp,
+  OSGKKey_PageDown,
+  OSGKKey_End,
+  OSGKKey_Home,
+  OSGKKey_Left,
+  OSGKKey_Up,
+  OSGKKey_Right,
+  OSGKKey_Down,
+  OSGKKey_Insert,
+  OSGKKey_Delete,
+  OSGKKey_F1,
+  OSGKKey_F2,
+  OSGKKey_F3,
+  OSGKKey_F4,
+  OSGKKey_F5,
+  OSGKKey_F6,
+  OSGKKey_F7,
+  OSGKKey_F8,
+  OSGKKey_F9,
+  OSGKKey_F10,
+  OSGKKey_F11,
+  OSGKKey_F12,
+  OSGKKey_NumLock,
+  OSGKKey_ScrollLock,
+  OSGKKey_Meta
+};
+
+static int (*osgk_browser_event_key) (
+  OSGK_Browser* browser, unsigned int key,
+  OSGK_KeyboardEventType eventType);
+
+typedef enum OSGK_AntiAliasType
+{
+  aaNone,
+  aaGray,
+  aaSubpixel
+} OSGK_AntiAliasType;
+
+/*static void (*osgk_browser_set_antialias) (
+  OSGK_Browser* browser, OSGK_AntiAliasType aaType);*/
+/*static OSGK_AntiAliasType (*osgk_browser_get_antialias) (OSGK_Browser* browser);*/
+
+/*static void (*osgk_browser_focus) (OSGK_Browser* browser);*/
+
+static void (*osgk_browser_resize) (OSGK_Browser* browser,
+  int width, int height);
+
+/* --- >8 --- >8 --- End OffscreenGecko headers --- 8< --- 8< --- */
+
+#include "quakedef.h"
+#include "cl_dyntexture.h"
+#include "cl_gecko.h"
+#include "timing.h"
+
+#define DEFAULT_GECKO_SIZE       512
+
+static rtexturepool_t *cl_geckotexturepool;
+static OSGK_Embedding *cl_geckoembedding;
+
+struct clgecko_s {
+       qboolean active;
+       char name[ MAX_QPATH + 32 ];
+
+       OSGK_Browser *browser;
+       int width, height;
+       int texWidth, texHeight;
+       
+       rtexture_t *texture;
+};
+
+static clgecko_t cl_geckoinstances[ MAX_GECKO_INSTANCES ];
+
+static dllhandle_t osgk_dll = NULL;
+
+static clgecko_t * cl_gecko_findunusedinstance( void ) {
+       int i;
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( !instance->active ) {
+                       return instance;
+               }
+       }
+       if( developer.integer > 0 ) {
+               Con_Printf( "cl_gecko_findunusedinstance: out of geckos\n" );
+       }
+       return NULL;
+}
+
+clgecko_t * CL_Gecko_FindBrowser( const char *name ) {
+       int i;
+
+       if( !name || !*name || strncmp( name, CLGECKOPREFIX, sizeof( CLGECKOPREFIX ) - 1 ) != 0 ) {
+               if( developer.integer > 0 ) {
+                       Con_Printf( "CL_Gecko_FindBrowser: Bad gecko texture name '%s'!\n", name );
+               }
+               return NULL;
+       }
+
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( instance->active && strcmp( instance->name, name ) == 0 ) {
+                       return instance;
+               }
+       }
+
+       if( developer.integer > 0 ) {
+               Con_Printf( "CL_Gecko_FindBrowser: No browser named '%s'!\n", name );
+       }
+
+       return NULL;
+}
+
 static void cl_gecko_updatecallback( rtexture_t *texture, void* callbackData ) {
-       clgecko_t *instance = callbackData;\r
-       const unsigned char *data;\r
-       if( instance->browser ) {\r
-               // TODO: OSGK only supports BGRA right now\r
-               TIMING_TIMESTATEMENT(data = osgk_browser_lock_data( instance->browser, NULL ));\r
-               R_UpdateTexture( texture, data, 0, 0, instance->width, instance->height );\r
-               osgk_browser_unlock_data( instance->browser, data );\r
-       }\r
-}\r
-\r
-static void cl_gecko_linktexture( clgecko_t *instance ) {\r
-       // TODO: assert that instance->texture == NULL\r
-       instance->texture = R_LoadTexture2D( cl_geckotexturepool, instance->name, \r
-               instance->texWidth, instance->texHeight, NULL, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PERSISTENT, NULL );\r
-       R_MakeTextureDynamic( instance->texture, cl_gecko_updatecallback, instance );\r
-       CL_LinkDynTexture( instance->name, instance->texture );\r
-}\r
-\r
-static void cl_gecko_unlinktexture( clgecko_t *instance ) {\r
-       if( instance->texture ) {\r
-               CL_UnlinkDynTexture( instance->name );\r
-               R_FreeTexture( instance->texture );\r
-               instance->texture = NULL;\r
-       }\r
-}\r
-\r
-void CL_Gecko_Resize( clgecko_t *instance, int width, int height ) {\r
-       int newWidth, newHeight;\r
-\r
-       // early out if bad parameters are passed (no resize to a texture size bigger than the original texture size)\r
-       if( !instance || !instance->browser) {\r
-               return;\r
-       }\r
-\r
-       newWidth = CeilPowerOf2( width );\r
-       newHeight = CeilPowerOf2( height );\r
-       if ((newWidth != instance->texWidth) || (newHeight != instance->texHeight))\r
-       {\r
-               cl_gecko_unlinktexture( instance );\r
-               instance->texWidth = newWidth;\r
-               instance->texHeight = newHeight;\r
-               cl_gecko_linktexture( instance );\r
-       }\r
-       else\r
-       {\r
-               /* The gecko area will only cover a part of the texture; to avoid\r
-               'old' pixels bleeding in at the border clear the texture. */\r
-               R_ClearTexture( instance->texture );\r
-       }\r
-\r
-       osgk_browser_resize( instance->browser, width, height);\r
-       instance->width = width;\r
-       instance->height = height;\r
-}\r
-\r
-void CL_Gecko_GetTextureExtent( clgecko_t *instance, float* pwidth, float* pheight )\r
-{\r
-       if( !instance || !instance->browser ) {\r
-               return;\r
-       }\r
-\r
-       *pwidth = (float)instance->width / instance->texWidth;\r
-       *pheight = (float)instance->height / instance->texHeight;\r
-}\r
-\r
-#if defined(WIN64)\r
-# define XULRUNNER_DIR_SUFFIX  "win64"\r
-#elif defined(WIN32)\r
-# define XULRUNNER_DIR_SUFFIX  "win32"\r
-#elif defined(DP_ARCH) && defined(DP_MACHINE)\r
-# define XULRUNNER_DIR_SUFFIX  DP_ARCH "-" DP_MACHINE\r
-#endif\r
-\r
-clgecko_t * CL_Gecko_CreateBrowser( const char *name ) {\r
-       clgecko_t *instance;\r
-\r
-       if (!osgk_dll) return NULL;\r
-\r
-       // TODO: verify that we dont use a name twice\r
-       instance = cl_gecko_findunusedinstance();\r
-       // TODO: assert != NULL\r
-       \r
-       if( cl_geckoembedding == NULL ) {\r
-               char profile_path [MAX_OSPATH];\r
-               OSGK_GeckoResult grc;\r
-               OSGK_EmbeddingOptions *options;\r
-\r
-               if( developer.integer > 0 ) {\r
-                       Con_Printf( "CL_Gecko_CreateBrowser: setting up gecko embedding\n" );\r
-               }\r
-\r
+       clgecko_t *instance = callbackData;
+       const unsigned char *data;
+       if( instance->browser ) {
+               // TODO: OSGK only supports BGRA right now
+               TIMING_TIMESTATEMENT(data = osgk_browser_lock_data( instance->browser, NULL ));
+               R_UpdateTexture( texture, data, 0, 0, instance->width, instance->height );
+               osgk_browser_unlock_data( instance->browser, data );
+       }
+}
+
+static void cl_gecko_linktexture( clgecko_t *instance ) {
+       // TODO: assert that instance->texture == NULL
+       instance->texture = R_LoadTexture2D( cl_geckotexturepool, instance->name, 
+               instance->texWidth, instance->texHeight, NULL, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PERSISTENT, NULL );
+       R_MakeTextureDynamic( instance->texture, cl_gecko_updatecallback, instance );
+       CL_LinkDynTexture( instance->name, instance->texture );
+}
+
+static void cl_gecko_unlinktexture( clgecko_t *instance ) {
+       if( instance->texture ) {
+               CL_UnlinkDynTexture( instance->name );
+               R_FreeTexture( instance->texture );
+               instance->texture = NULL;
+       }
+}
+
+void CL_Gecko_Resize( clgecko_t *instance, int width, int height ) {
+       int newWidth, newHeight;
+
+       // early out if bad parameters are passed (no resize to a texture size bigger than the original texture size)
+       if( !instance || !instance->browser) {
+               return;
+       }
+
+       newWidth = CeilPowerOf2( width );
+       newHeight = CeilPowerOf2( height );
+       if ((newWidth != instance->texWidth) || (newHeight != instance->texHeight))
+       {
+               cl_gecko_unlinktexture( instance );
+               instance->texWidth = newWidth;
+               instance->texHeight = newHeight;
+               cl_gecko_linktexture( instance );
+       }
+       else
+       {
+               /* The gecko area will only cover a part of the texture; to avoid
+               'old' pixels bleeding in at the border clear the texture. */
+               R_ClearTexture( instance->texture );
+       }
+
+       osgk_browser_resize( instance->browser, width, height);
+       instance->width = width;
+       instance->height = height;
+}
+
+void CL_Gecko_GetTextureExtent( clgecko_t *instance, float* pwidth, float* pheight )
+{
+       if( !instance || !instance->browser ) {
+               return;
+       }
+
+       *pwidth = (float)instance->width / instance->texWidth;
+       *pheight = (float)instance->height / instance->texHeight;
+}
+
+#if defined(WIN64)
+# define XULRUNNER_DIR_SUFFIX  "win64"
+#elif defined(WIN32)
+# define XULRUNNER_DIR_SUFFIX  "win32"
+#elif defined(DP_ARCH) && defined(DP_MACHINE)
+# define XULRUNNER_DIR_SUFFIX  DP_ARCH "-" DP_MACHINE
+#endif
+
+clgecko_t * CL_Gecko_CreateBrowser( const char *name ) {
+       clgecko_t *instance;
+
+       if (!osgk_dll) return NULL;
+
+       // TODO: verify that we dont use a name twice
+       instance = cl_gecko_findunusedinstance();
+       // TODO: assert != NULL
+       
+       if( cl_geckoembedding == NULL ) {
+               char profile_path [MAX_OSPATH];
+               OSGK_GeckoResult grc;
+               OSGK_EmbeddingOptions *options;
+
+               if( developer.integer > 0 ) {
+                       Con_Printf( "CL_Gecko_CreateBrowser: setting up gecko embedding\n" );
+               }
+
                options = osgk_embedding_options_create();
        #ifdef XULRUNNER_DIR_SUFFIX
-               osgk_embedding_options_add_search_path( options, "./xulrunner-" XULRUNNER_DIR_SUFFIX "/" );\r
-       #endif\r
-               osgk_embedding_options_add_search_path( options, "./xulrunner/" );\r
-               dpsnprintf (profile_path, sizeof (profile_path), "%s/xulrunner_profile/", fs_gamedir);\r
-               osgk_embedding_options_set_profile_dir( options, profile_path, 0 );\r
-               cl_geckoembedding = osgk_embedding_create_with_options( options, &grc );\r
-               osgk_release( options );\r
-               \r
-               if( cl_geckoembedding == NULL ) {\r
-                       Con_Printf( "CL_Gecko_CreateBrowser: Couldn't retrieve gecko embedding object (%.8x)!\n", grc );\r
-                       return NULL;\r
-               } else if( developer.integer > 0 ) {\r
-                       Con_Printf( "CL_Gecko_CreateBrowser: Embedding set up correctly\n" );\r
-               }\r
-       }\r
-\r
-       instance->active = true;\r
-       strlcpy( instance->name, name, sizeof( instance->name ) );\r
-       instance->browser = osgk_browser_create( cl_geckoembedding, DEFAULT_GECKO_SIZE, DEFAULT_GECKO_SIZE );\r
-       if( instance->browser == NULL ) {\r
-               Con_Printf( "CL_Gecko_CreateBrowser: Browser object creation failed!\n" );\r
-       }\r
-       // TODO: assert != NULL\r
-\r
-       instance->width = instance->texWidth = DEFAULT_GECKO_SIZE;\r
-       instance->height = instance->texHeight = DEFAULT_GECKO_SIZE;\r
-       cl_gecko_linktexture( instance );\r
-\r
-       return instance;\r
-}\r
-\r
-void CL_Gecko_DestroyBrowser( clgecko_t *instance ) {\r
-   if( !instance || !instance->active ) {\r
-               return;\r
-       }\r
-\r
-       instance->active = false;\r
-       cl_gecko_unlinktexture( instance );\r
-\r
-       osgk_release( instance->browser );\r
-       instance->browser = NULL;\r
-}\r
-\r
-void CL_Gecko_Frame( void ) {\r
-       int i;\r
-       // FIXME: track cl_numgeckoinstances to avoid scanning the entire array?\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( instance->active ) {\r
-                       if( instance->browser && osgk_browser_query_dirty( instance->browser ) == 1 ) {\r
-                               R_MarkDirtyTexture( instance->texture );\r
-                       }\r
-               }\r
-       }\r
-}\r
-\r
-static void cl_gecko_start( void )\r
-{\r
-       int i;\r
-       cl_geckotexturepool = R_AllocTexturePool();\r
-\r
-       // recreate textures on module start\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( instance->active ) {\r
-                       cl_gecko_linktexture( instance );\r
-               }\r
-       }\r
-}\r
-\r
-static void cl_gecko_shutdown( void )\r
-{\r
-       int i;\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( instance->active ) {\r
-                       cl_gecko_unlinktexture( instance );\r
-               }\r
-       }\r
-       R_FreeTexturePool( &cl_geckotexturepool );\r
-}\r
-\r
-static void cl_gecko_newmap( void )\r
-{\r
-       // DO NOTHING\r
-}\r
-\r
-void CL_Gecko_Shutdown( void ) {\r
-       int i;\r
-       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {\r
-               clgecko_t *instance = &cl_geckoinstances[ i ];\r
-               if( instance->active ) {\r
-                       cl_gecko_unlinktexture( instance );\r
-               }               \r
-       }\r
-\r
-       if (cl_geckoembedding != NULL)\r
-       {\r
-           osgk_release( cl_geckoembedding );\r
-           cl_geckoembedding = NULL;\r
-       }\r
-\r
-       if (osgk_dll != NULL)\r
-       {\r
-           Sys_UnloadLibrary (&osgk_dll);\r
-       }\r
-}\r
-\r
-static void cl_gecko_create_f( void ) {\r
-       char name[MAX_QPATH];\r
-\r
-       if (Cmd_Argc() != 2)\r
-       {\r
-               Con_Print("usage: gecko_create <name>\npcreates a browser (full texture path " CLGECKOPREFIX "<name>)\n");\r
-               return;\r
-       }\r
-\r
-       // TODO: use snprintf instead\r
-       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));\r
-       CL_Gecko_CreateBrowser( name );\r
-}\r
-\r
-static void cl_gecko_destroy_f( void ) {\r
-       char name[MAX_QPATH];\r
-\r
-       if (Cmd_Argc() != 2)\r
-       {\r
-               Con_Print("usage: gecko_destroy <name>\ndestroys a browser\n");\r
-               return;\r
-       }\r
-\r
-       // TODO: use snprintf instead\r
-       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));\r
-       CL_Gecko_DestroyBrowser( CL_Gecko_FindBrowser( name ) );\r
-}\r
-\r
-static void cl_gecko_navigate_f( void ) {\r
-       char name[MAX_QPATH];\r
-       const char *URI;\r
-\r
-       if (Cmd_Argc() != 3)\r
-       {\r
-               Con_Print("usage: gecko_navigate <name> <URI>\nnavigates to a certain URI\n");\r
-               return;\r
-       }\r
-\r
-       // TODO: use snprintf instead\r
-       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));\r
-       URI = Cmd_Argv( 2 );\r
-       CL_Gecko_NavigateToURI( CL_Gecko_FindBrowser( name ), URI );\r
-}\r
-\r
-static void cl_gecko_injecttext_f( void ) {\r
-       char name[MAX_QPATH];\r
-       const char *text;\r
-       clgecko_t *instance;\r
-       const char *p;\r
-\r
-       if (Cmd_Argc() < 3)\r
-       {\r
-               Con_Print("usage: gecko_injecttext <name> <text>\ninjects a certain text into the browser\n");\r
-               return;\r
-       }\r
-\r
-       // TODO: use snprintf instead\r
-       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));\r
-       instance = CL_Gecko_FindBrowser( name );\r
-       if( !instance ) {\r
-               Con_Printf( "cl_gecko_injecttext_f: gecko instance '%s' couldn't be found!\n", name );\r
-               return;\r
-       }\r
-\r
-       text = Cmd_Argv( 2 );\r
-\r
-       for( p = text ; *p ; p++ ) {\r
-               unsigned key = *p;\r
-               switch( key ) {\r
-                       case ' ':\r
-                               key = K_SPACE;\r
-                               break;\r
-                       case '\\':\r
-                               key = *++p;\r
-                               switch( key ) {\r
-                               case 'n':\r
-                                       key = K_ENTER;\r
-                                       break;\r
-                               case '\0':\r
-                                       --p;\r
-                                       key = '\\';\r
-                                       break;\r
-                               }\r
-                               break;\r
-               }\r
-\r
-               CL_Gecko_Event_Key( instance, key, CLG_BET_PRESS );\r
-       }\r
-}\r
-\r
-static void gl_gecko_movecursor_f( void ) {\r
-       char name[MAX_QPATH];\r
-       float x, y;\r
-\r
-       if (Cmd_Argc() != 4)\r
-       {\r
-               Con_Print("usage: gecko_movecursor <name> <x> <y>\nmove the cursor to a certain position\n");\r
-               return;\r
-       }\r
-\r
-       // TODO: use snprintf instead\r
-       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));\r
-       x = atof( Cmd_Argv( 2 ) );\r
-       y = atof( Cmd_Argv( 3 ) );\r
-\r
-       CL_Gecko_Event_CursorMove( CL_Gecko_FindBrowser( name ), x, y );\r
-}\r
-\r
-#undef osgk_addref\r
-#undef osgk_release\r
-\r
-static const dllfunction_t osgkFuncs[] =\r
-{\r
-       {"osgk_addref",                             (void **) &osgk_addref},\r
-       {"osgk_release",                            (void **) &osgk_release},\r
-       {"osgk_embedding_create2",                  (void **) &osgk_embedding_create2},\r
-       {"osgk_embedding_options_create",           (void **) &osgk_embedding_options_create},\r
-       {"osgk_embedding_options_add_search_path",  (void **) &osgk_embedding_options_add_search_path},\r
-       {"osgk_embedding_options_set_profile_dir",  (void **) &osgk_embedding_options_set_profile_dir},\r
-       {"osgk_browser_create",                     (void **) &osgk_browser_create},\r
-       {"osgk_browser_query_dirty",                (void **) &osgk_browser_query_dirty},\r
-       {"osgk_browser_navigate",                   (void **) &osgk_browser_navigate},\r
-       {"osgk_browser_lock_data",                  (void **) &osgk_browser_lock_data},\r
-       {"osgk_browser_unlock_data",                (void **) &osgk_browser_unlock_data},\r
-       {"osgk_browser_resize",                     (void **) &osgk_browser_resize},\r
-       {"osgk_browser_event_mouse_move",           (void **) &osgk_browser_event_mouse_move},\r
-       {"osgk_browser_event_mouse_button",         (void **) &osgk_browser_event_mouse_button},\r
-       {"osgk_browser_event_mouse_wheel",          (void **) &osgk_browser_event_mouse_wheel},\r
-       {"osgk_browser_event_key",                  (void **) &osgk_browser_event_key},\r
-       {NULL, NULL}\r
-};\r
-\r
-void CL_Gecko_Init( void )\r
-{\r
-       const char* dllnames [] =\r
-       {\r
-       #if defined(WIN64)\r
-               "OffscreenGecko64.dll",\r
-       #elif defined(WIN32)\r
-               "OffscreenGecko.dll",\r
-       #elif defined(MACOSX)\r
-               "OffscreenGecko.dylib",\r
-       #else\r
-               "OffscreenGecko.so",\r
-       #endif\r
-               NULL\r
-       };\r
-       \r
-       if (!osgk_dll)\r
-       {\r
-               if (! Sys_LoadLibrary (dllnames, &osgk_dll, osgkFuncs))\r
-               {\r
-                       Con_Printf ("Could not load OffscreenGecko, Gecko support unavailable\n");\r
-               }\r
-       }\r
-\r
-       Cmd_AddCommand( "gecko_create", cl_gecko_create_f, "Create a gecko browser instance" );\r
-       Cmd_AddCommand( "gecko_destroy", cl_gecko_destroy_f, "Destroy a gecko browser instance" );\r
-       Cmd_AddCommand( "gecko_navigate", cl_gecko_navigate_f, "Navigate a gecko browser to a URI" );\r
-       Cmd_AddCommand( "gecko_injecttext", cl_gecko_injecttext_f, "Injects text into a browser" );\r
-       Cmd_AddCommand( "gecko_movecursor", gl_gecko_movecursor_f, "Move the cursor to a certain position" );\r
-\r
-       R_RegisterModule( "CL_Gecko", cl_gecko_start, cl_gecko_shutdown, cl_gecko_newmap );\r
-}\r
-\r
-void CL_Gecko_NavigateToURI( clgecko_t *instance, const char *URI ) {\r
-       if( !instance || !instance->browser ) {\r
-               return;\r
-       }\r
-\r
-       if( instance->active ) {\r
-               osgk_browser_navigate( instance->browser, URI );\r
-       }\r
-}\r
-\r
-void CL_Gecko_Event_CursorMove( clgecko_t *instance, float x, float y ) {\r
-       // TODO: assert x, y \in [0.0, 1.0]\r
-       int mappedx, mappedy;\r
-\r
-       if( !instance || !instance->browser ) {\r
-               return;\r
-       }\r
-\r
-       mappedx = x * instance->width;\r
-       mappedy = y * instance->height;\r
-       osgk_browser_event_mouse_move( instance->browser, mappedx, mappedy );\r
-}\r
-\r
-typedef struct geckokeymapping_s {\r
-       keynum_t keycode;\r
-       unsigned int geckokeycode;\r
-} geckokeymapping_t;\r
-\r
-static geckokeymapping_t geckokeymappingtable[] = {\r
-       { K_BACKSPACE, OSGKKey_Backspace },\r
-       { K_TAB, OSGKKey_Tab },\r
-       { K_ENTER, OSGKKey_Return },\r
-       { K_SHIFT, OSGKKey_Shift },\r
-       { K_CTRL, OSGKKey_Control },\r
-       { K_ALT, OSGKKey_Alt },\r
-       { K_CAPSLOCK, OSGKKey_CapsLock },\r
-       { K_ESCAPE, OSGKKey_Escape },\r
-       { K_SPACE, OSGKKey_Space },\r
-       { K_PGUP, OSGKKey_PageUp },\r
-       { K_PGDN, OSGKKey_PageDown },\r
-       { K_END, OSGKKey_End },\r
-       { K_HOME, OSGKKey_Home },\r
-       { K_LEFTARROW, OSGKKey_Left },\r
-       { K_UPARROW, OSGKKey_Up },\r
-       { K_RIGHTARROW, OSGKKey_Right },\r
-       { K_DOWNARROW, OSGKKey_Down },\r
-       { K_INS, OSGKKey_Insert },\r
-       { K_DEL, OSGKKey_Delete },\r
-       { K_F1, OSGKKey_F1 },\r
-       { K_F2, OSGKKey_F2 },\r
-       { K_F3, OSGKKey_F3 },\r
-       { K_F4, OSGKKey_F4 },\r
-       { K_F5, OSGKKey_F5 },\r
-       { K_F6, OSGKKey_F6 },\r
-       { K_F7, OSGKKey_F7 },\r
-       { K_F8, OSGKKey_F8 },\r
-       { K_F9, OSGKKey_F9 },\r
-       { K_F10, OSGKKey_F10 },\r
-       { K_F11, OSGKKey_F11 },\r
-       { K_F12, OSGKKey_F12 },\r
-       { K_NUMLOCK, OSGKKey_NumLock },\r
-       { K_SCROLLOCK, OSGKKey_ScrollLock }\r
-};\r
-\r
-qboolean CL_Gecko_Event_Key( clgecko_t *instance, keynum_t key, clgecko_buttoneventtype_t eventtype ) {\r
-       if( !instance || !instance->browser ) {\r
-               return false;\r
-       }\r
-\r
-       // determine whether its a keyboard event\r
-       if( key < K_OTHERDEVICESBEGIN ) {\r
-\r
-               OSGK_KeyboardEventType mappedtype;\r
-               unsigned int mappedkey = key;\r
-               \r
-               unsigned int i;\r
-               // yes! then convert it if necessary!\r
-               for( i = 0 ; i < sizeof( geckokeymappingtable ) / sizeof( *geckokeymappingtable ) ; i++ ) {\r
-                       const geckokeymapping_t * const mapping = &geckokeymappingtable[ i ];\r
-                       if( key == mapping->keycode ) {\r
-                               mappedkey = mapping->geckokeycode;\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               // convert the eventtype\r
-               // map the type\r
-               switch( eventtype ) {\r
-               case CLG_BET_DOWN:\r
-                       mappedtype = keDown;\r
-                       break;\r
-               case CLG_BET_UP:\r
-                       mappedtype = keUp;\r
-                       break;\r
-               case CLG_BET_DOUBLECLICK:\r
-                       // TODO: error message\r
-                       break;\r
-               case CLG_BET_PRESS:\r
-                       mappedtype = kePress;\r
-               }\r
-\r
-               return osgk_browser_event_key( instance->browser, mappedkey, mappedtype ) != 0;\r
-       } else if( K_MOUSE1 <= key && key <= K_MOUSE3 ) {\r
-               OSGK_MouseButtonEventType mappedtype;\r
-               OSGK_MouseButton mappedbutton;\r
-\r
-               mappedbutton = (OSGK_MouseButton) (mbLeft + (key - K_MOUSE1));\r
-\r
-               switch( eventtype ) {\r
-               case CLG_BET_DOWN:\r
-                       mappedtype = meDown;\r
-                       break;\r
-               case CLG_BET_UP:\r
-                       mappedtype = meUp;\r
-                       break;\r
-               case CLG_BET_DOUBLECLICK:\r
-                       mappedtype = meDoubleClick;\r
-                       break;\r
-               case CLG_BET_PRESS:\r
-                       // hihi, hacky hacky\r
-                       osgk_browser_event_mouse_button( instance->browser, mappedbutton, meDown );\r
-                       mappedtype = meUp;\r
-                       break;\r
-               }\r
-\r
-               osgk_browser_event_mouse_button( instance->browser, mappedbutton, mappedtype );\r
-               return true;\r
-       } else if( K_MWHEELUP <= key && key <= K_MWHEELDOWN ) {\r
-               if( eventtype == CLG_BET_DOWN )\r
-                       osgk_browser_event_mouse_wheel( instance->browser, \r
-                               waVertical, (key == K_MWHEELUP) ? wdNegative : wdPositive );\r
-               return true;\r
-       }\r
-       // TODO: error?\r
-       return false;\r
-}\r
+               osgk_embedding_options_add_search_path( options, "./xulrunner-" XULRUNNER_DIR_SUFFIX "/" );
+       #endif
+               osgk_embedding_options_add_search_path( options, "./xulrunner/" );
+               dpsnprintf (profile_path, sizeof (profile_path), "%s/xulrunner_profile/", fs_gamedir);
+               osgk_embedding_options_set_profile_dir( options, profile_path, 0 );
+               cl_geckoembedding = osgk_embedding_create_with_options( options, &grc );
+               osgk_release( options );
+               
+               if( cl_geckoembedding == NULL ) {
+                       Con_Printf( "CL_Gecko_CreateBrowser: Couldn't retrieve gecko embedding object (%.8x)!\n", grc );
+                       return NULL;
+               } else if( developer.integer > 0 ) {
+                       Con_Printf( "CL_Gecko_CreateBrowser: Embedding set up correctly\n" );
+               }
+       }
+
+       instance->active = true;
+       strlcpy( instance->name, name, sizeof( instance->name ) );
+       instance->browser = osgk_browser_create( cl_geckoembedding, DEFAULT_GECKO_SIZE, DEFAULT_GECKO_SIZE );
+       if( instance->browser == NULL ) {
+               Con_Printf( "CL_Gecko_CreateBrowser: Browser object creation failed!\n" );
+       }
+       // TODO: assert != NULL
+
+       instance->width = instance->texWidth = DEFAULT_GECKO_SIZE;
+       instance->height = instance->texHeight = DEFAULT_GECKO_SIZE;
+       cl_gecko_linktexture( instance );
+
+       return instance;
+}
+
+void CL_Gecko_DestroyBrowser( clgecko_t *instance ) {
+   if( !instance || !instance->active ) {
+               return;
+       }
+
+       instance->active = false;
+       cl_gecko_unlinktexture( instance );
+
+       osgk_release( instance->browser );
+       instance->browser = NULL;
+}
+
+void CL_Gecko_Frame( void ) {
+       int i;
+       // FIXME: track cl_numgeckoinstances to avoid scanning the entire array?
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( instance->active ) {
+                       if( instance->browser && osgk_browser_query_dirty( instance->browser ) == 1 ) {
+                               R_MarkDirtyTexture( instance->texture );
+                       }
+               }
+       }
+}
+
+static void cl_gecko_start( void )
+{
+       int i;
+       cl_geckotexturepool = R_AllocTexturePool();
+
+       // recreate textures on module start
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( instance->active ) {
+                       cl_gecko_linktexture( instance );
+               }
+       }
+}
+
+static void cl_gecko_shutdown( void )
+{
+       int i;
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( instance->active ) {
+                       cl_gecko_unlinktexture( instance );
+               }
+       }
+       R_FreeTexturePool( &cl_geckotexturepool );
+}
+
+static void cl_gecko_newmap( void )
+{
+       // DO NOTHING
+}
+
+void CL_Gecko_Shutdown( void ) {
+       int i;
+       for( i = 0 ; i < MAX_GECKO_INSTANCES ; i++ ) {
+               clgecko_t *instance = &cl_geckoinstances[ i ];
+               if( instance->active ) {
+                       cl_gecko_unlinktexture( instance );
+               }               
+       }
+
+       if (cl_geckoembedding != NULL)
+       {
+           osgk_release( cl_geckoembedding );
+           cl_geckoembedding = NULL;
+       }
+
+       if (osgk_dll != NULL)
+       {
+           Sys_UnloadLibrary (&osgk_dll);
+       }
+}
+
+static void cl_gecko_create_f( void ) {
+       char name[MAX_QPATH];
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Print("usage: gecko_create <name>\npcreates a browser (full texture path " CLGECKOPREFIX "<name>)\n");
+               return;
+       }
+
+       // TODO: use snprintf instead
+       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));
+       CL_Gecko_CreateBrowser( name );
+}
+
+static void cl_gecko_destroy_f( void ) {
+       char name[MAX_QPATH];
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Print("usage: gecko_destroy <name>\ndestroys a browser\n");
+               return;
+       }
+
+       // TODO: use snprintf instead
+       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));
+       CL_Gecko_DestroyBrowser( CL_Gecko_FindBrowser( name ) );
+}
+
+static void cl_gecko_navigate_f( void ) {
+       char name[MAX_QPATH];
+       const char *URI;
+
+       if (Cmd_Argc() != 3)
+       {
+               Con_Print("usage: gecko_navigate <name> <URI>\nnavigates to a certain URI\n");
+               return;
+       }
+
+       // TODO: use snprintf instead
+       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));
+       URI = Cmd_Argv( 2 );
+       CL_Gecko_NavigateToURI( CL_Gecko_FindBrowser( name ), URI );
+}
+
+static void cl_gecko_injecttext_f( void ) {
+       char name[MAX_QPATH];
+       const char *text;
+       clgecko_t *instance;
+       const char *p;
+
+       if (Cmd_Argc() < 3)
+       {
+               Con_Print("usage: gecko_injecttext <name> <text>\ninjects a certain text into the browser\n");
+               return;
+       }
+
+       // TODO: use snprintf instead
+       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));
+       instance = CL_Gecko_FindBrowser( name );
+       if( !instance ) {
+               Con_Printf( "cl_gecko_injecttext_f: gecko instance '%s' couldn't be found!\n", name );
+               return;
+       }
+
+       text = Cmd_Argv( 2 );
+
+       for( p = text ; *p ; p++ ) {
+               unsigned key = *p;
+               switch( key ) {
+                       case ' ':
+                               key = K_SPACE;
+                               break;
+                       case '\\':
+                               key = *++p;
+                               switch( key ) {
+                               case 'n':
+                                       key = K_ENTER;
+                                       break;
+                               case '\0':
+                                       --p;
+                                       key = '\\';
+                                       break;
+                               }
+                               break;
+               }
+
+               CL_Gecko_Event_Key( instance, key, CLG_BET_PRESS );
+       }
+}
+
+static void gl_gecko_movecursor_f( void ) {
+       char name[MAX_QPATH];
+       float x, y;
+
+       if (Cmd_Argc() != 4)
+       {
+               Con_Print("usage: gecko_movecursor <name> <x> <y>\nmove the cursor to a certain position\n");
+               return;
+       }
+
+       // TODO: use snprintf instead
+       sprintf(name, CLGECKOPREFIX "%s", Cmd_Argv(1));
+       x = atof( Cmd_Argv( 2 ) );
+       y = atof( Cmd_Argv( 3 ) );
+
+       CL_Gecko_Event_CursorMove( CL_Gecko_FindBrowser( name ), x, y );
+}
+
+#undef osgk_addref
+#undef osgk_release
+
+static const dllfunction_t osgkFuncs[] =
+{
+       {"osgk_addref",                             (void **) &osgk_addref},
+       {"osgk_release",                            (void **) &osgk_release},
+       {"osgk_embedding_create2",                  (void **) &osgk_embedding_create2},
+       {"osgk_embedding_options_create",           (void **) &osgk_embedding_options_create},
+       {"osgk_embedding_options_add_search_path",  (void **) &osgk_embedding_options_add_search_path},
+       {"osgk_embedding_options_set_profile_dir",  (void **) &osgk_embedding_options_set_profile_dir},
+       {"osgk_browser_create",                     (void **) &osgk_browser_create},
+       {"osgk_browser_query_dirty",                (void **) &osgk_browser_query_dirty},
+       {"osgk_browser_navigate",                   (void **) &osgk_browser_navigate},
+       {"osgk_browser_lock_data",                  (void **) &osgk_browser_lock_data},
+       {"osgk_browser_unlock_data",                (void **) &osgk_browser_unlock_data},
+       {"osgk_browser_resize",                     (void **) &osgk_browser_resize},
+       {"osgk_browser_event_mouse_move",           (void **) &osgk_browser_event_mouse_move},
+       {"osgk_browser_event_mouse_button",         (void **) &osgk_browser_event_mouse_button},
+       {"osgk_browser_event_mouse_wheel",          (void **) &osgk_browser_event_mouse_wheel},
+       {"osgk_browser_event_key",                  (void **) &osgk_browser_event_key},
+       {NULL, NULL}
+};
+
+void CL_Gecko_Init( void )
+{
+       const char* dllnames [] =
+       {
+       #if defined(WIN64)
+               "OffscreenGecko64.dll",
+       #elif defined(WIN32)
+               "OffscreenGecko.dll",
+       #elif defined(MACOSX)
+               "OffscreenGecko.dylib",
+       #else
+               "OffscreenGecko.so",
+       #endif
+               NULL
+       };
+       
+       if (!osgk_dll)
+       {
+               if (! Sys_LoadLibrary (dllnames, &osgk_dll, osgkFuncs))
+               {
+                       Con_Printf ("Could not load OffscreenGecko, Gecko support unavailable\n");
+               }
+       }
+
+       Cmd_AddCommand( "gecko_create", cl_gecko_create_f, "Create a gecko browser instance" );
+       Cmd_AddCommand( "gecko_destroy", cl_gecko_destroy_f, "Destroy a gecko browser instance" );
+       Cmd_AddCommand( "gecko_navigate", cl_gecko_navigate_f, "Navigate a gecko browser to a URI" );
+       Cmd_AddCommand( "gecko_injecttext", cl_gecko_injecttext_f, "Injects text into a browser" );
+       Cmd_AddCommand( "gecko_movecursor", gl_gecko_movecursor_f, "Move the cursor to a certain position" );
+
+       R_RegisterModule( "CL_Gecko", cl_gecko_start, cl_gecko_shutdown, cl_gecko_newmap );
+}
+
+void CL_Gecko_NavigateToURI( clgecko_t *instance, const char *URI ) {
+       if( !instance || !instance->browser ) {
+               return;
+       }
+
+       if( instance->active ) {
+               osgk_browser_navigate( instance->browser, URI );
+       }
+}
+
+void CL_Gecko_Event_CursorMove( clgecko_t *instance, float x, float y ) {
+       // TODO: assert x, y \in [0.0, 1.0]
+       int mappedx, mappedy;
+
+       if( !instance || !instance->browser ) {
+               return;
+       }
+
+       mappedx = x * instance->width;
+       mappedy = y * instance->height;
+       osgk_browser_event_mouse_move( instance->browser, mappedx, mappedy );
+}
+
+typedef struct geckokeymapping_s {
+       keynum_t keycode;
+       unsigned int geckokeycode;
+} geckokeymapping_t;
+
+static geckokeymapping_t geckokeymappingtable[] = {
+       { K_BACKSPACE, OSGKKey_Backspace },
+       { K_TAB, OSGKKey_Tab },
+       { K_ENTER, OSGKKey_Return },
+       { K_SHIFT, OSGKKey_Shift },
+       { K_CTRL, OSGKKey_Control },
+       { K_ALT, OSGKKey_Alt },
+       { K_CAPSLOCK, OSGKKey_CapsLock },
+       { K_ESCAPE, OSGKKey_Escape },
+       { K_SPACE, OSGKKey_Space },
+       { K_PGUP, OSGKKey_PageUp },
+       { K_PGDN, OSGKKey_PageDown },
+       { K_END, OSGKKey_End },
+       { K_HOME, OSGKKey_Home },
+       { K_LEFTARROW, OSGKKey_Left },
+       { K_UPARROW, OSGKKey_Up },
+       { K_RIGHTARROW, OSGKKey_Right },
+       { K_DOWNARROW, OSGKKey_Down },
+       { K_INS, OSGKKey_Insert },
+       { K_DEL, OSGKKey_Delete },
+       { K_F1, OSGKKey_F1 },
+       { K_F2, OSGKKey_F2 },
+       { K_F3, OSGKKey_F3 },
+       { K_F4, OSGKKey_F4 },
+       { K_F5, OSGKKey_F5 },
+       { K_F6, OSGKKey_F6 },
+       { K_F7, OSGKKey_F7 },
+       { K_F8, OSGKKey_F8 },
+       { K_F9, OSGKKey_F9 },
+       { K_F10, OSGKKey_F10 },
+       { K_F11, OSGKKey_F11 },
+       { K_F12, OSGKKey_F12 },
+       { K_NUMLOCK, OSGKKey_NumLock },
+       { K_SCROLLOCK, OSGKKey_ScrollLock }
+};
+
+qboolean CL_Gecko_Event_Key( clgecko_t *instance, keynum_t key, clgecko_buttoneventtype_t eventtype ) {
+       if( !instance || !instance->browser ) {
+               return false;
+       }
+
+       // determine whether its a keyboard event
+       if( key < K_OTHERDEVICESBEGIN ) {
+
+               OSGK_KeyboardEventType mappedtype;
+               unsigned int mappedkey = key;
+               
+               unsigned int i;
+               // yes! then convert it if necessary!
+               for( i = 0 ; i < sizeof( geckokeymappingtable ) / sizeof( *geckokeymappingtable ) ; i++ ) {
+                       const geckokeymapping_t * const mapping = &geckokeymappingtable[ i ];
+                       if( key == mapping->keycode ) {
+                               mappedkey = mapping->geckokeycode;
+                               break;
+                       }
+               }
+
+               // convert the eventtype
+               // map the type
+               switch( eventtype ) {
+               case CLG_BET_DOWN:
+                       mappedtype = keDown;
+                       break;
+               case CLG_BET_UP:
+                       mappedtype = keUp;
+                       break;
+               case CLG_BET_DOUBLECLICK:
+                       // TODO: error message
+                       break;
+               case CLG_BET_PRESS:
+                       mappedtype = kePress;
+               }
+
+               return osgk_browser_event_key( instance->browser, mappedkey, mappedtype ) != 0;
+       } else if( K_MOUSE1 <= key && key <= K_MOUSE3 ) {
+               OSGK_MouseButtonEventType mappedtype;
+               OSGK_MouseButton mappedbutton;
+
+               mappedbutton = (OSGK_MouseButton) (mbLeft + (key - K_MOUSE1));
+
+               switch( eventtype ) {
+               case CLG_BET_DOWN:
+                       mappedtype = meDown;
+                       break;
+               case CLG_BET_UP:
+                       mappedtype = meUp;
+                       break;
+               case CLG_BET_DOUBLECLICK:
+                       mappedtype = meDoubleClick;
+                       break;
+               case CLG_BET_PRESS:
+                       // hihi, hacky hacky
+                       osgk_browser_event_mouse_button( instance->browser, mappedbutton, meDown );
+                       mappedtype = meUp;
+                       break;
+               }
+
+               osgk_browser_event_mouse_button( instance->browser, mappedbutton, mappedtype );
+               return true;
+       } else if( K_MWHEELUP <= key && key <= K_MWHEELDOWN ) {
+               if( eventtype == CLG_BET_DOWN )
+                       osgk_browser_event_mouse_wheel( instance->browser, 
+                               waVertical, (key == K_MWHEELUP) ? wdNegative : wdPositive );
+               return true;
+       }
+       // TODO: error?
+       return false;
+}