[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC

 #include "pango-font.c"
 #include "pango-fontmap.c"
 #include "pango-render.c"
-typedef IV         CFPlus__Channel;
+typedef IV         DC__Channel;
-typedef SDL_RWops *CFPlus__RW;
+typedef SDL_RWops *DC__RW;
-typedef Mix_Chunk *CFPlus__MixChunk;
+typedef Mix_Chunk *DC__MixChunk;
-typedef Mix_Music *CFPlus__MixMusic;
+typedef Mix_Music *DC__MixMusic;
-typedef PangoFontDescription *CFPlus__Font;
+typedef PangoFontDescription *DC__Font;
 static int
 shape_attr_p (PangoLayoutRun *run)
 {
   GSList *attrs = run->item->analysis.extra_attrs;
 typedef struct cf_layout {
   PangoLayout *pl;
   float r, g, b, a; // default color for rgba mode
   int base_height;
-  CFPlus__Font font;
+  DC__Font font;
   rc_t *rc;
-} *CFPlus__Layout;
+} *DC__Layout;
-static CFPlus__Font default_font;
+static DC__Font default_font;
 static PangoContext *opengl_context;
 static PangoFontMap *opengl_fontmap;
 static void
 substitute_func (FcPattern *pattern, gpointer data)
 #endif
   FcPatternAddBool (pattern, FC_AUTOHINT, 0);
 }
 static void
-layout_update_font (CFPlus__Layout self)
+layout_update_font (DC__Layout self)
 {
   /* use a random scale factor to account for unknown descenders, 0.8 works
    * reasonably well with bitstream vera
    */
   PangoFontDescription *font = self->font ? self->font : default_font;
   pango_layout_set_font_description (self->pl, font);
 }
 static void
-layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
+layout_get_pixel_size (DC__Layout self, int *w, int *h)
 {
   PangoRectangle rect;
   // get_pixel_* wrongly rounds down
   pango_layout_get_extents (self->pl, 0, &rect);
   int faces; tileid *face2tile; // [faceid]
   int texs;  maptex *tex;       // [tileid]
   int32_t rows;
   maprow *row;
-} *CFPlus__Map;
+} *DC__Map;
 static char *
 prepend (char *ptr, int sze, int inc)
 {
   char *p;
       self->texs *= 2;
     }
 }
 static maprow *
-map_get_row (CFPlus__Map self, int y)
+map_get_row (DC__Map self, int y)
 {
   if (0 > y)
     {
       int extend = - y + MAP_EXTEND_Y;
       Prepend (maprow, self->row, self->rows, extend);
   return row->col + (x - row->c0);
 }
 static mapcell *
-map_get_cell (CFPlus__Map self, int x, int y)
+map_get_cell (DC__Map self, int x, int y)
 {
   return row_get_cell (map_get_row (self, y), x);
 }
 static void
-map_clear (CFPlus__Map self)
+map_clear (DC__Map self)
 {
   int r;
   for (r = 0; r < self->rows; r++)
     Safefree (self->row[r].col);
   self->row  = 0;
   self->rows = 0;
 }
 static void
-map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
+map_blank (DC__Map self, int x0, int y0, int w, int h)
 {
   int x, y;
   maprow *row;
   mapcell *cell;
     return 0;
   return 1;
 }
-MODULE = CFPlus	PACKAGE = CFPlus
+MODULE = Deliantra::Client	PACKAGE = DC
 PROTOTYPES: ENABLE
 BOOT:
 {
-  HV *stash = gv_stashpv ("CFPlus", 1);
+  HV *stash = gv_stashpv ("DC", 1);
   static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
 	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
         if (m && m != (SDL_Rect **)-1)
           while (*m)
             {
-              if ((*m)->w >= 640 && (*m)->h >= 480)
+              if ((*m)->w >= 800 && (*m)->h >= 480)
                 {
                   AV *av = newAV ();
                   av_push (av, newSViv ((*m)->w));
                   av_push (av, newSViv ((*m)->h));
                   av_push (av, newSViv (rgb));
                   hv_store (hv, "data1",  5, newSViv ((IV)ev.user.data1), 0);
                   hv_store (hv, "data2",  5, newSViv ((IV)ev.user.data2), 0);
                   break;
               }
-            XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
+            XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
           }
 }
 int
 Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
 void
 error (char *message)
 	CODE:
         fprintf (stderr, "ERROR: %s\n", message);
 #ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
+        MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
 #endif
 void
 fatal (char *message)
 	CODE:
         fprintf (stderr, "FATAL: %s\n", message);
 #ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
+        MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
 #endif
         _exit (1);
 void
 _exit (int retval = 0)
 #if DEBUG
 	VALGRIND_DO_LEAK_CHECK;
 #endif
 }
-MODULE = CFPlus	PACKAGE = CFPlus::Font
+MODULE = Deliantra::Client	PACKAGE = DC::Font
 PROTOTYPES: DISABLE
-CFPlus::Font
+DC::Font
 new_from_file (SV *class, char *path, int id = 0)
 	CODE:
 {
         int count;
         FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
 }
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFPlus::Font self)
+DESTROY (DC::Font self)
 	CODE:
         pango_font_description_free (self);
 void
-make_default (CFPlus::Font self)
+make_default (DC::Font self)
 	PROTOTYPE: $
 	CODE:
         default_font = self;
-MODULE = CFPlus	PACKAGE = CFPlus::Layout
+MODULE = Deliantra::Client	PACKAGE = DC::Layout
 PROTOTYPES: DISABLE
 void
-reset_glyph_cache ()
+glyph_cache_backup ()
 	PROTOTYPE:
 	CODE:
+        tc_backup ();
+void
+glyph_cache_restore ()
+	PROTOTYPE:
+	CODE:
-        tc_clear ();
+        tc_restore ();
-CFPlus::Layout
+DC::Layout
 new (SV *class)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
         RETVAL->pl          = pango_layout_new (opengl_context);
         layout_update_font (RETVAL);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFPlus::Layout self)
+DESTROY (DC::Layout self)
 	CODE:
         g_object_unref (self->pl);
         rc_free (self->rc);
         Safefree (self);
 void
-set_text (CFPlus::Layout self, SV *text_)
+set_text (DC::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
         char *text = SvPVutf8 (text_, textlen);
         pango_layout_set_text (self->pl, text, textlen);
 }
 void
-set_markup (CFPlus::Layout self, SV *text_)
+set_markup (DC::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
         char *text = SvPVutf8 (text_, textlen);
         pango_layout_set_markup (self->pl, text, textlen);
 }
 void
-set_shapes (CFPlus::Layout self, ...)
+set_shapes (DC::Layout self, ...)
 	CODE:
 {
         PangoAttrList *attrs = 0;
         const char *text = pango_layout_get_text (self->pl);
         const char *pos = text;
         if (attrs)
           pango_layout_set_attributes (self->pl, attrs);
 }
 void
-get_shapes (CFPlus::Layout self)
+get_shapes (DC::Layout self)
 	PPCODE:
 {
         PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
         do
         pango_layout_iter_free (iter);
 }
 int
-has_wrapped (CFPlus::Layout self)
+has_wrapped (DC::Layout self)
 	CODE:
 {
 	int lines = 1;
         const char *text = pango_layout_get_text (self->pl);
 }
 	OUTPUT:
         RETVAL
 SV *
-get_text (CFPlus::Layout self)
+get_text (DC::Layout self)
 	CODE:
         RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
         sv_utf8_decode (RETVAL);
 	OUTPUT:
         RETVAL
 void
-set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
+set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
 	CODE:
         self->r = r;
         self->g = g;
         self->b = b;
         self->a = a;
 void
-set_font (CFPlus::Layout self, CFPlus::Font font = 0)
+set_font (DC::Layout self, DC::Font font = 0)
 	CODE:
         if (self->font != font)
 	  {
             self->font = font;
             layout_update_font (self);
           }
 void
-set_height (CFPlus::Layout self, int base_height)
+set_height (DC::Layout self, int base_height)
 	CODE:
         if (self->base_height != base_height)
   	  {
             self->base_height = base_height;
             layout_update_font (self);
           }
 void
-set_width (CFPlus::Layout self, int max_width = -1)
+set_width (DC::Layout self, int max_width = -1)
 	CODE:
         pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
 void
-set_indent (CFPlus::Layout self, int indent)
+set_indent (DC::Layout self, int indent)
 	CODE:
         pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
 void
-set_spacing (CFPlus::Layout self, int spacing)
+set_spacing (DC::Layout self, int spacing)
 	CODE:
         pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
 void
-set_ellipsise (CFPlus::Layout self, int ellipsise)
+set_ellipsise (DC::Layout self, int ellipsise)
 	CODE:
         pango_layout_set_ellipsize (self->pl,
             ellipsise == 1 ? PANGO_ELLIPSIZE_START
           : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
           : ellipsise == 3 ? PANGO_ELLIPSIZE_END
           :                  PANGO_ELLIPSIZE_NONE
         );
 void
-set_single_paragraph_mode (CFPlus::Layout self, int spm)
+set_single_paragraph_mode (DC::Layout self, int spm)
 	CODE:
         pango_layout_set_single_paragraph_mode (self->pl, !!spm);
 void
-size (CFPlus::Layout self)
+size (DC::Layout self)
 	PPCODE:
 {
 	int w, h;
         layout_get_pixel_size (self, &w, &h);
         PUSHs (sv_2mortal (newSViv (w)));
         PUSHs (sv_2mortal (newSViv (h)));
 }
 int
-descent (CFPlus::Layout self)
+descent (DC::Layout self)
 	CODE:
 {
 	PangoRectangle rect;
         PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
 	pango_layout_line_get_pixel_extents (line, 0, &rect);
 }
 	OUTPUT:
         RETVAL
 int
-xy_to_index (CFPlus::Layout self, int x, int y)
+xy_to_index (DC::Layout self, int x, int y)
 	CODE:
 {
 	int index, trailing;
         pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
         RETVAL = index + trailing;
 }
 	OUTPUT:
         RETVAL
 void
-cursor_pos (CFPlus::Layout self, int index)
+cursor_pos (DC::Layout self, int index)
 	PPCODE:
 {
 	PangoRectangle strong_pos;
         pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
         PUSHs (sv_2mortal (newSViv (strong_pos.y      / PANGO_SCALE)));
         PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
 }
 void
-index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
+index_to_line_x (DC::Layout self, int index, int trailing = 0)
 	PPCODE:
 {
 	int line, x;
 	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
+#if !PANGO_VERSION_CHECK (1, 17. 3)
         /* pango bug: line is between 1..numlines, not 0..numlines-1 */
+        --line;
+#endif
         EXTEND (SP, 2);
-        PUSHs (sv_2mortal (newSViv (line - 1)));
+        PUSHs (sv_2mortal (newSViv (line)));
         PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
 }
 void
-line_x_to_index (CFPlus::Layout self, int line, int x)
+line_x_to_index (DC::Layout self, int line, int x)
 	PPCODE:
 {
 	PangoLayoutLine *lp;
         int index, trailing;
             PUSHs (sv_2mortal (newSViv (trailing)));
           }
 }
 void
-render (CFPlus::Layout self, float x, float y, int flags = 0)
+render (DC::Layout self, float x, float y, int flags = 0)
 	CODE:
         rc_clear (self->rc);
         pango_opengl_render_layout_subpixel (
           self->pl,
           self->rc,
         // we assume that context_change actually clears/frees stuff
         // and does not do any recomputation...
         pango_layout_context_changed (self->pl);
 void
-draw (CFPlus::Layout self)
+draw (DC::Layout self)
 	CODE:
 {
         glEnable (GL_TEXTURE_2D);
         glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         glEnable (GL_BLEND);
         glDisable (GL_ALPHA_TEST);
         glDisable (GL_BLEND);
         glDisable (GL_TEXTURE_2D);
 }
-MODULE = CFPlus	PACKAGE = CFPlus::Texture
+MODULE = Deliantra::Client	PACKAGE = DC::Texture
 PROTOTYPES: ENABLE
 void
 pad (SV *data_, int ow, int oh, int nw, int nh)
         RETVAL = width > 0;
 }
 	OUTPUT:
         RETVAL
-MODULE = CFPlus	PACKAGE = CFPlus::Map
+MODULE = Deliantra::Client	PACKAGE = DC::Map
 PROTOTYPES: DISABLE
-CFPlus::Map
+DC::Map
 new (SV *class)
 	CODE:
         New (0, RETVAL, 1, struct map);
         RETVAL->x  = 0;
         RETVAL->y  = 0;
         RETVAL->row = 0;
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFPlus::Map self)
+DESTROY (DC::Map self)
 	CODE:
 {
         map_clear (self);
         Safefree (self->face2tile);
         Safefree (self->tex);
         Safefree (self);
 }
 void
-resize (CFPlus::Map self, int map_width, int map_height)
+resize (DC::Map self, int map_width, int map_height)
 	CODE:
         self->w = map_width;
         self->h = map_height;
 void
-clear (CFPlus::Map self)
+clear (DC::Map self)
 	CODE:
         map_clear (self);
 void
-set_tileid (CFPlus::Map self, int face, int tile)
+set_tileid (DC::Map self, int face, int tile)
 	CODE:
 {
 	need_facenum (self, face); self->face2tile [face] = tile;
         need_texid   (self, tile);
 }
 void
-set_smooth (CFPlus::Map self, int face, int smooth, int level)
+set_smooth (DC::Map self, int face, int smooth, int level)
 	CODE:
 {
   	tileid texid;
         maptex *tex;
         tex->smoothtile  = self->face2tile [smooth];
         tex->smoothlevel = level;
 }
 void
-set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
+set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
 	CODE:
 {
 	need_texid (self, texid);
         {
        // from transparent color bleeding and ugly wrapping effects.
        glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 }
 int
-ox (CFPlus::Map self)
+ox (DC::Map self)
 	ALIAS:
            oy = 1
            x  = 2
            y  = 3
            w  = 4
           }
 	OUTPUT:
         RETVAL
 void
-scroll (CFPlus::Map self, int dx, int dy)
+scroll (DC::Map self, int dx, int dy)
 	CODE:
 {
         if (dx > 0)
           map_blank (self, self->x, self->y, dx, self->h);
         else if (dx < 0)
             self->y    += MAP_EXTEND_Y;
           }
 }
 SV *
-map1a_update (CFPlus::Map self, SV *data_, int extmap)
+map1a_update (DC::Map self, SV *data_, int extmap)
 	CODE:
 {
         uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
         uint8_t *data_end = (uint8_t *)SvEND (data_);
         mapcell *cell;
 }
 	OUTPUT:
         RETVAL
 SV *
-mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
+mapmap (DC::Map self, int x0, int y0, int w, int h)
 	CODE:
 {
 	int x1, x;
 	int y1, y;
         int z;
 }
 	OUTPUT:
         RETVAL
 void
-draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
+draw (DC::Map self, int mx, int my, int sw, int sh, int T)
 	CODE:
 {
         int x, y, z;
   	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
                   }
             }
 }
 void
-draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
+draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
 	CODE:
 {
 	static float color[16][3] = {
            { 0.00F, 0.00F, 0.00F },
            { 1.00F, 1.00F, 1.00F },
         glDisable (GL_BLEND);
         glDisable (GL_TEXTURE_2D);
 }
 void
-fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
+fow_texture (DC::Map self, int mx, int my, int sw, int sh)
 	PPCODE:
 {
         int x, y;
         int sw1  = sw + 2;
         int sh1  = sh + 2;
         PUSHs (sv_2mortal (newSViv (sh3)));
         PUSHs (darkness3_sv);
 }
 SV *
-get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
+get_rect (DC::Map self, int x0, int y0, int w, int h)
 	CODE:
 {
 	int x, y, x1, y1;
 	SV *data_sv = newSV (w * h * 7 + 5);
         uint8_t *data = (uint8_t *)SvPVX (data_sv);
 }
 	OUTPUT:
         RETVAL
 void
-set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
+set_rect (DC::Map self, int x0, int y0, uint8_t *data)
 	PPCODE:
 {
 	int x, y, z;
         int w, h;
         int x1, y1;
                   }
               }
           }
 }
-MODULE = CFPlus	PACKAGE = CFPlus::RW
+MODULE = Deliantra::Client	PACKAGE = DC::RW
-CFPlus::RW
+DC::RW
 new (SV *class, SV *data_sv)
 	CODE:
 {
         STRLEN datalen;
         char *data = SvPVbyte (data_sv, datalen);
         RETVAL = SDL_RWFromConstMem (data, datalen);
 }
 	OUTPUT:
         RETVAL
-CFPlus::RW
+DC::RW
 new_from_file (SV *class, const char *path, const char *mode = "rb")
 	CODE:
         RETVAL = SDL_RWFromFile (path, mode);
 	OUTPUT:
         RETVAL
 # fails on win32:
-# CFPlus.xs(2268) : error C2059: syntax error : '('
+# dc.xs(2268) : error C2059: syntax error : '('
 #void
-#close (CFPlus::RW self)
+#close (DC::RW self)
 #	CODE:
 #        (self->(close)) (self);
-MODULE = CFPlus	PACKAGE = CFPlus::Channel
+MODULE = Deliantra::Client	PACKAGE = DC::Channel
 PROTOTYPES: DISABLE
-CFPlus::Channel
+DC::Channel
 find ()
 	CODE:
 {
         RETVAL = Mix_GroupAvailable (-1);
 }
 	OUTPUT:
         RETVAL
 void
-halt (CFPlus::Channel self)
+halt (DC::Channel self)
 	CODE:
         Mix_HaltChannel (self);
 void
-expire (CFPlus::Channel self, int ticks = -1)
+expire (DC::Channel self, int ticks = -1)
 	CODE:
         Mix_ExpireChannel (self, ticks);
 void
-fade_out (CFPlus::Channel self, int ticks = -1)
+fade_out (DC::Channel self, int ticks = -1)
 	CODE:
         Mix_FadeOutChannel (self, ticks);
 int
-volume (CFPlus::Channel self, int volume)
+volume (DC::Channel self, int volume)
 	CODE:
         RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
 	OUTPUT:
         RETVAL
 void
-unregister_all_effects (CFPlus::Channel self)
+unregister_all_effects (DC::Channel self)
 	CODE:
         Mix_UnregisterAllEffects (self);
 void
-set_panning (CFPlus::Channel self, int left, int right)
+set_panning (DC::Channel self, int left, int right)
 	CODE:
         left  = CLAMP (left , 0, 255);
         right = CLAMP (right, 0, 255);
         Mix_SetPanning (self, left, right);
 void
-set_distance (CFPlus::Channel self, int distance)
+set_distance (DC::Channel self, int distance)
 	CODE:
         Mix_SetDistance (self, CLAMP (distance, 0, 255));
 void
-set_position (CFPlus::Channel self, int angle, int distance)
+set_position (DC::Channel self, int angle, int distance)
 	CODE:
 void
-set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
+set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
 	CODE:
 {
 	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
         int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
         Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
 }
 void
-set_reverse_stereo (CFPlus::Channel self, int flip)
+set_reverse_stereo (DC::Channel self, int flip)
 	CODE:
         Mix_SetReverseStereo (self, flip);
-MODULE = CFPlus	PACKAGE = CFPlus::MixChunk
+MODULE = Deliantra::Client	PACKAGE = DC::MixChunk
 PROTOTYPES: DISABLE
-CFPlus::MixChunk
+DC::MixChunk
-new (SV *class, CFPlus::RW rwops)
+new (SV *class, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadWAV_RW (rwops, 1);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFPlus::MixChunk self)
+DESTROY (DC::MixChunk self)
 	CODE:
         Mix_FreeChunk (self);
 int
-volume (CFPlus::MixChunk self, int volume = -1)
+volume (DC::MixChunk self, int volume = -1)
 	CODE:
         if (items > 1)
           volume = CLAMP (volume, 0, 128);
         RETVAL = Mix_VolumeChunk (self, volume);
 	OUTPUT:
         RETVAL
-CFPlus::Channel
+DC::Channel
-play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
+play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
 	CODE:
 {
         RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
         if (RETVAL < 0)
           }
 }
 	OUTPUT:
         RETVAL
-MODULE = CFPlus	PACKAGE = CFPlus::MixMusic
+MODULE = Deliantra::Client	PACKAGE = DC::MixMusic
 int
 volume (int volume = -1)
 	PROTOTYPE: ;$
 	CODE:
 void
 halt ()
 	CODE:
         Mix_HaltMusic ();
-CFPlus::MixMusic
+DC::MixMusic
-new (SV *class, CFPlus::RW rwops)
+new (SV *class, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadMUS_RW (rwops);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFPlus::MixMusic self)
+DESTROY (DC::MixMusic self)
 	CODE:
         Mix_FreeMusic (self);
 int
-play (CFPlus::MixMusic self, int loops = -1)
+play (DC::MixMusic self, int loops = -1)
 	CODE:
         RETVAL = Mix_PlayMusic (self, loops);
 	OUTPUT:
         RETVAL
 void
-fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
+fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
 	CODE:
         Mix_FadeInMusicPos (self, loops, ms, position);
-MODULE = CFPlus	PACKAGE = CFPlus::OpenGL
+MODULE = Deliantra::Client	PACKAGE = DC::OpenGL
 PROTOTYPES: ENABLE
 BOOT:
 {
-  HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
+  HV *stash = gv_stashpv ("DC::OpenGL", 1);
   static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
 void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
 	CODE:
         if (gl.SeparableFilter2D)
 	  gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
-void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
+void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
 void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
 void glDrawPixels (int width, int height, int format, int type, char *pixels)
 void glEndList ()
 void glCallList (int list)
-MODULE = CFPlus	PACKAGE = CFPlus::UI::Base
+MODULE = Deliantra::Client	PACKAGE = DC::UI::Base
 PROTOTYPES: DISABLE
 void
 find_widget (SV *self, NV x, NV y)
           XPUSHs (self);
 }
 BOOT:
 {
-  hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
+  hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
-  draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
+  draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
-  draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
+  draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
-  draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
+  draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
-  draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
+  draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
 }
 void
 draw (SV *self)
 	CODE:
         SV *draw_w_sv = GvSV (draw_w_gv);
         SV *draw_h_sv = GvSV (draw_h_gv);
         double draw_x, draw_y;
         if (!SvROK (self))
-          croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
+          croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
         hv = (HV *)SvRV (self);
         if (SvTYPE (hv) != SVt_PVHV)
-          croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
+          croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
         svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
         svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
         if (!h || !w)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs. Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC