ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.186 by root, Sat Apr 21 09:25:31 2007 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 62#else
58# define PARACHUTE 0 63# define PARACHUTE 0
59#endif 64#endif
60 65
66static AV *texture_av;
67
61static struct 68static struct
62{ 69{
63#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 71#include "glfunc.h"
65#undef GL_FUNC 72#undef GL_FUNC
66} gl; 73} gl;
67 74
75static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 77{
70 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 82 else
75 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
84}
85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
76} 108}
77 109
78#include "texcache.c" 110#include "texcache.c"
79 111
80#include "pango-font.c" 112#include "pango-font.c"
… …
400 432
401/* SDL should provide this, really. */ 433/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 434#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 435#define SDLK_MODIFIER_MAX 314
404 436
405static AV *texture_av;
406
407MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
408 438
409PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
410 440
411BOOT: 441BOOT:
412{ 442{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
416 HV *stash = gv_stashpv ("CFPlus", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
417 static const struct { 444 static const struct {
418 const char *name; 445 const char *name;
419 IV iv; 446 IV iv;
420 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
… …
619 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
621 ); 648 );
622 if (RETVAL) 649 if (RETVAL)
623 { 650 {
651 av_clear (texture_av);
652
624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626# include "glfunc.h" 655# include "glfunc.h"
627# undef GL_FUNC 656# undef GL_FUNC
657
628 } 658 }
629 OUTPUT: 659 OUTPUT:
630 RETVAL 660 RETVAL
631 661
632void 662void
… …
634 664
635char * 665char *
636SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
637 667
638void 668void
639SDL_PollEvent () 669poll_events ()
640 PPCODE: 670 PPCODE:
641{ 671{
642 SDL_Event ev; 672 SDL_Event ev;
643 673
644 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645 { 676 {
646 HV *hv = newHV (); 677 HV *hv = newHV ();
647 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
648 679
649 switch (ev.type) 680 switch (ev.type)
… …
661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663 break; 694 break;
664 695
665 case SDL_MOUSEMOTION: 696 case SDL_MOUSEMOTION:
697 {
698 int state = ev.motion.state;
699 int x = ev.motion.x;
700 int y = ev.motion.y;
701 int xrel = ev.motion.xrel;
702 int yrel = ev.motion.yrel;
703
704 /* do simplistic event compression */
705 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
706 && state == ev.motion.state)
707 {
708 xrel += ev.motion.xrel;
709 yrel += ev.motion.yrel;
710 x = ev.motion.x;
711 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 }
714
666 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
667
668 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
669 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
670 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
671 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
673 break; 722 break;
674 723
675 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
676 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
677 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
857 ExitThread (retval); // unclean, please beam me up 906 ExitThread (retval); // unclean, please beam me up
858#else 907#else
859 _exit (retval); 908 _exit (retval);
860#endif 909#endif
861 910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
862MODULE = CFPlus PACKAGE = CFPlus::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
863 921
864CFPlus::Font 922CFPlus::Font
865new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
866 CODE: 924 CODE:
… …
1396 CODE: 1454 CODE:
1397{ 1455{
1398 if (dx > 0) 1456 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1458 else if (dx < 0)
1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1459 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402 1460
1403 if (dy > 0) 1461 if (dy > 0)
1404 map_blank (self, self->x, self->y, self->w, dy); 1462 map_blank (self, self->x, self->y, self->w, dy);
1405 else if (dy < 0) 1463 else if (dy < 0)
1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1464 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407 1465
1408 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1409 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1410 1468
1411 while (self->y < 0) 1469 while (self->y < 0)
… …
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he)); 1799 IV bits = SvIVX (HeVAL (he));
1742 1800
1743 if (!(bits & 0x1000) 1801 if (!(bits & 0x1000)
1744 && skey->level == level 1802 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y]) 1803 && level > smooth_max [skey->x][skey->y])
1746 { 1804 {
1747 maptex tex = self->tex [skey->tile]; 1805 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T; 1806 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T; 1807 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15; 1808 int border = bits & 15;
… …
2101 CODE: 2159 CODE:
2102 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
2103 OUTPUT: 2161 OUTPUT:
2104 RETVAL 2162 RETVAL
2105 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
2106CFPlus::MixMusic 2171CFPlus::MixMusic
2107new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
2108 CODE: 2173 CODE:
2109 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
2110 OUTPUT: 2175 OUTPUT:
… …
2117 2182
2118int 2183int
2119play (CFPlus::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
2120 CODE: 2185 CODE:
2121 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
2187 OUTPUT:
2188 RETVAL
2189
2190int
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2192 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2122 OUTPUT: 2194 OUTPUT:
2123 RETVAL 2195 RETVAL
2124 2196
2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2126 2198
… …
2215# undef const_iv 2287# undef const_iv
2216 }; 2288 };
2217 2289
2218 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2290 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2219 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2291 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2292
2293 texture_av = newAV ();
2294 AvREAL_off (texture_av);
2220} 2295}
2221 2296
2222char * 2297char *
2223gl_vendor () 2298gl_vendor ()
2224 CODE: 2299 CODE:
… …
2373 2448
2374void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2375 2450
2376int glGenTexture () 2451int glGenTexture ()
2377 CODE: 2452 CODE:
2378{ 2453 RETVAL = gen_texture ();
2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
2383 glGenTextures (1, &name);
2384 RETVAL = name;
2385}
2386 OUTPUT: 2454 OUTPUT:
2387 RETVAL 2455 RETVAL
2388 2456
2389void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
2390 CODE: 2458 CODE:
2391{ 2459 del_texture (name);
2392 /* make a half-assed attempt at returning the memory used by the texture */ 2460
2393 /* textures are frequently being reused by cfplus anyway */
2394 glBindTexture (GL_TEXTURE_2D, name);
2395 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2396 av_push (texture_av, (SV *)name);
2397 /*glDeleteTextures (1, &name_);*/
2398}
2399
2400int glGenList () 2461int glGenList ()
2401 CODE: 2462 CODE:
2402 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
2403 OUTPUT: 2464 OUTPUT:
2404 RETVAL 2465 RETVAL

Diff Legend

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