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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
155 rc_t *rc; 177 rc_t *rc;
156} *CFPlus__Layout; 178} *DC__Layout;
157 179
158static CFPlus__Font default_font; 180static DC__Font default_font;
159static PangoContext *opengl_context; 181static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
161 183
162static void 184static void
163substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
168#endif 190#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 192}
171 193
172static void 194static void
173layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 204
183 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
184} 206}
185 207
186static void 208static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 210{
189 PangoRectangle rect; 211 PangoRectangle rect;
190 212
191 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
233 255
234 int32_t rows; 256 int32_t rows;
235 maprow *row; 257 maprow *row;
236} *CFPlus__Map; 258} *DC__Map;
237 259
238static char * 260static char *
239prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
240{ 262{
241 char *p; 263 char *p;
279 self->texs *= 2; 301 self->texs *= 2;
280 } 302 }
281} 303}
282 304
283static maprow * 305static maprow *
284map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
285{ 307{
286 if (0 > y) 308 if (0 > y)
287 { 309 {
288 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
327 349
328 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
329} 351}
330 352
331static mapcell * 353static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
333{ 355{
334 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
335} 357}
336 358
337static void 359static void
338map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
339{ 361{
340 int r; 362 int r;
341 363
342 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
355static void 387static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
360 mapcell *cell; 392 mapcell *cell;
361 393
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
498 return 0; 527 return 0;
499 528
500 return 1; 529 return 1;
501} 530}
502 531
503MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
504 571
505PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
506 573
507BOOT: 574BOOT:
508{ 575{
509 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 577 static const struct {
511 const char *name; 578 const char *name;
512 IV iv; 579 IV iv;
513 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
691
692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
624# undef const_iv 722# undef const_iv
625 }; 723 };
626 724
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 755 CODE:
658{ 756{
659 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
662} 765}
663 766
664char *
665SDL_GetError () 767char *SDL_GetError ()
666 768
667int 769void SDL_braino ()
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 770
670void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
671SDL_Quit () 777void SDL_Quit ()
778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
672 787
673void 788void
674SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
675 PPCODE: 790 PPCODE:
676{ 791{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 806
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 809
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 811
700 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
701 while (*m) 813 while (*m)
702 { 814 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 816 {
705 AV *av = newAV (); 817 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
732 844
733 if (RETVAL) 845 if (RETVAL)
734 { 846 {
735 av_clear (texture_av); 847 av_clear (texture_av);
736 848
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 851#include "glfunc.h"
740#undef GL_FUNC 852#undef GL_FUNC
741 } 853 }
742} 854}
749char * 861char *
750SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
751 863
752int 864int
753SDL_GetAppState () 865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
754 869
755void 870void
756poll_events () 871poll_events ()
757 PPCODE: 872 PPCODE:
758{ 873{
768 { 883 {
769 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
770 case SDL_KEYUP: 885 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 891 break;
777 892
778 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 912 x = ev.motion.x;
798 y = ev.motion.y; 913 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 915 }
801 916
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 923 }
809 break; 924 break;
810 925
811 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 929
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 940 break;
826 } 941 }
827 942
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 944 }
830} 945}
831 946
832int 947int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 949 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
952
953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
837 968
838void 969void
839Mix_CloseAudio () 970Mix_CloseAudio ()
840 971
841int 972int
876 } 1007 }
877 } 1008 }
878#endif 1009#endif
879} 1010}
880 1011
881void 1012int
882add_font (char *file) 1013add_font (char *file)
883 CODE: 1014 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
885 1018
886void 1019void
887load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
888 ALIAS: 1021 ALIAS:
889 load_image_file = 1 1022 load_image_file = 1
975void 1108void
976error (char *message) 1109error (char *message)
977 CODE: 1110 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1112#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1114#endif
982 1115
983void 1116void
984fatal (char *message) 1117fatal (char *message)
985 CODE: 1118 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1120#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1122#endif
990 _exit (1); 1123 _exit (1);
991 1124
992void 1125void
993_exit (int retval = 0) 1126_exit (int retval = 0)
1005#if DEBUG 1138#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1139 VALGRIND_DO_LEAK_CHECK;
1007#endif 1140#endif
1008} 1141}
1009 1142
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1144
1012PROTOTYPES: DISABLE 1145PROTOTYPES: DISABLE
1013 1146
1014CFPlus::Font 1147DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1149 CODE:
1017{ 1150{
1018 int count; 1151 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1155}
1023 OUTPUT: 1156 OUTPUT:
1024 RETVAL 1157 RETVAL
1025 1158
1026void 1159void
1027DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
1028 CODE: 1161 CODE:
1029 pango_font_description_free (self); 1162 pango_font_description_free (self);
1030 1163
1031void 1164void
1032make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1033 PROTOTYPE: $ 1166 PROTOTYPE: $
1034 CODE: 1167 CODE:
1035 default_font = self; 1168 default_font = self;
1036 1169
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1171
1039PROTOTYPES: DISABLE 1172PROTOTYPES: DISABLE
1040 1173
1041void 1174void
1042reset_glyph_cache () 1175glyph_cache_backup ()
1043 PROTOTYPE: 1176 PROTOTYPE:
1044 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
1045 tc_clear (); 1184 tc_restore ();
1046 1185
1047CFPlus::Layout 1186DC::Layout
1048new (SV *class) 1187new (SV *class)
1049 CODE: 1188 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
1051 1190
1052 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
1063 OUTPUT: 1202 OUTPUT:
1064 RETVAL 1203 RETVAL
1065 1204
1066void 1205void
1067DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
1068 CODE: 1207 CODE:
1069 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1070 rc_free (self->rc); 1209 rc_free (self->rc);
1071 Safefree (self); 1210 Safefree (self);
1072 1211
1073void 1212void
1074set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
1075 CODE: 1214 CODE:
1076{ 1215{
1077 STRLEN textlen; 1216 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
1079 1218
1080 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
1081} 1220}
1082 1221
1083void 1222void
1084set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
1085 CODE: 1224 CODE:
1086{ 1225{
1087 STRLEN textlen; 1226 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
1089 1228
1090 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
1091} 1230}
1092 1231
1093void 1232void
1094set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1095 CODE: 1234 CODE:
1096{ 1235{
1097 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1238 const char *pos = text;
1134 if (attrs) 1273 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1136} 1275}
1137 1276
1138void 1277void
1139get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1140 PPCODE: 1279 PPCODE:
1141{ 1280{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1282
1144 do 1283 do
1145 { 1284 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1286
1148 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1149 { 1288 {
1150 PangoRectangle extents; 1289 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1298
1160 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1161} 1300}
1162 1301
1163int 1302int
1164has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1165 CODE: 1304 CODE:
1166{ 1305{
1167 int lines = 1; 1306 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1169 1308
1174} 1313}
1175 OUTPUT: 1314 OUTPUT:
1176 RETVAL 1315 RETVAL
1177 1316
1178SV * 1317SV *
1179get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1180 CODE: 1319 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1322 OUTPUT:
1184 RETVAL 1323 RETVAL
1185 1324
1186void 1325void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1327 CODE:
1189 self->r = r; 1328 self->r = r;
1190 self->g = g; 1329 self->g = g;
1191 self->b = b; 1330 self->b = b;
1192 self->a = a; 1331 self->a = a;
1193 1332
1194void 1333void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1335 CODE:
1197 if (self->font != font) 1336 if (self->font != font)
1198 { 1337 {
1199 self->font = font; 1338 self->font = font;
1200 layout_update_font (self); 1339 layout_update_font (self);
1201 } 1340 }
1202 1341
1203void 1342void
1204set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1205 CODE: 1344 CODE:
1206 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1207 { 1346 {
1208 self->base_height = base_height; 1347 self->base_height = base_height;
1209 layout_update_font (self); 1348 layout_update_font (self);
1210 } 1349 }
1211 1350
1212void 1351void
1213set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1353 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1355
1217void 1356void
1218set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1219 CODE: 1358 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1360
1222void 1361void
1223set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1224 CODE: 1363 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1365
1227void 1366void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1368 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1235 ); 1374 );
1236 1375
1237void 1376void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1378 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1380
1242void 1381void
1243size (CFPlus::Layout self) 1382size (DC::Layout self)
1244 PPCODE: 1383 PPCODE:
1245{ 1384{
1246 int w, h; 1385 int w, h;
1247 1386
1248 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1253} 1392}
1254 1393
1255int 1394int
1256descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1257 CODE: 1396 CODE:
1258{ 1397{
1259 PangoRectangle rect; 1398 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1263} 1402}
1264 OUTPUT: 1403 OUTPUT:
1265 RETVAL 1404 RETVAL
1266 1405
1267int 1406int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1408 CODE:
1270{ 1409{
1271 int index, trailing; 1410 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1274} 1413}
1275 OUTPUT: 1414 OUTPUT:
1276 RETVAL 1415 RETVAL
1277 1416
1278void 1417void
1279cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1419 PPCODE:
1281{ 1420{
1282 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1423
1285 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1428}
1290 1429
1291void 1430void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1432 PPCODE:
1294{ 1433{
1295 int line, x; 1434 int line, x;
1296 1435
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1439 --line;
1440#endif
1300 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1444}
1304 1445
1305void 1446void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1448 PPCODE:
1308{ 1449{
1309 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1310 int index, trailing; 1451 int index, trailing;
1311 1452
1312 if (line < 0) 1453 if (line < 0)
1313 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1314 1455
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1317 1458
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1460
1320 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1468 }
1328} 1469}
1329 1470
1330void 1471void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1473 CODE:
1333 rc_clear (self->rc); 1474 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1335 self->pl, 1476 self->pl,
1336 self->rc, 1477 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1482 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1483 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1484 pango_layout_context_changed (self->pl);
1344 1485
1345void 1486void
1346draw (CFPlus::Layout self) 1487draw (DC::Layout self)
1347 CODE: 1488 CODE:
1348{ 1489{
1349 glEnable (GL_TEXTURE_2D); 1490 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1492 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1500 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1501 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1502 glDisable (GL_TEXTURE_2D);
1362} 1503}
1363 1504
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1506
1366PROTOTYPES: ENABLE 1507PROTOTYPES: ENABLE
1367 1508
1368void 1509void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1510pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1589 RETVAL = width > 0;
1449} 1590}
1450 OUTPUT: 1591 OUTPUT:
1451 RETVAL 1592 RETVAL
1452 1593
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1595
1455PROTOTYPES: DISABLE 1596PROTOTYPES: DISABLE
1456 1597
1457CFPlus::Map 1598DC::Map
1458new (SV *class) 1599new (SV *class)
1459 CODE: 1600 CODE:
1460 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1602 RETVAL->x = 0;
1462 RETVAL->y = 0; 1603 RETVAL->y = 0;
1470 RETVAL->row = 0; 1611 RETVAL->row = 0;
1471 OUTPUT: 1612 OUTPUT:
1472 RETVAL 1613 RETVAL
1473 1614
1474void 1615void
1475DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1476 CODE: 1617 CODE:
1477{ 1618{
1478 map_clear (self); 1619 map_clear (self);
1479 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1480 Safefree (self->tex); 1621 Safefree (self->tex);
1481 Safefree (self); 1622 Safefree (self);
1482} 1623}
1483 1624
1484void 1625void
1485resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1627 CODE:
1487 self->w = map_width; 1628 self->w = map_width;
1488 self->h = map_height; 1629 self->h = map_height;
1489 1630
1490void 1631void
1491clear (CFPlus::Map self) 1632clear (DC::Map self)
1492 CODE: 1633 CODE:
1493 map_clear (self); 1634 map_clear (self);
1494 1635
1495void 1636void
1496set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1638 CODE:
1498{ 1639{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1641 need_texid (self, tile);
1501} 1642}
1502 1643
1503void 1644void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1646 CODE:
1506{ 1647{
1507 tileid texid; 1648 tileid texid;
1508 maptex *tex; 1649 maptex *tex;
1509 1650
1522 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1524} 1665}
1525 1666
1526void 1667void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1669 CODE:
1529{ 1670{
1530 need_texid (self, texid); 1671 need_texid (self, texid);
1531 1672
1532 { 1673 {
1552 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1695}
1555 1696
1556int 1697int
1557ox (CFPlus::Map self) 1698ox (DC::Map self)
1558 ALIAS: 1699 ALIAS:
1559 oy = 1 1700 oy = 1
1560 x = 2 1701 x = 2
1561 y = 3 1702 y = 3
1562 w = 4 1703 w = 4
1573 } 1714 }
1574 OUTPUT: 1715 OUTPUT:
1575 RETVAL 1716 RETVAL
1576 1717
1577void 1718void
1578scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1579 CODE: 1720 CODE:
1580{ 1721{
1581 if (dx > 0) 1722 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1724 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1600 } 1741 }
1601} 1742}
1602 1743
1603SV * 1744SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1746 CODE:
1606{ 1747{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1750 mapcell *cell;
1637 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1638 1779
1639 do 1780 do
1640 { 1781 {
1641 ext = *data++; 1782 ext = *data++;
1642 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1643 1784
1644 if (cmd < 4) 1785 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1647 { 1788 {
1650 } 1791 }
1651 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1654 { 1795 {
1655 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 1800
1658 data += *data + 1; 1801 data += *data + 1;
1659 } 1802 }
1660 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1804 cell->flags = *data++;
1691 } 1834 }
1692 } 1835 }
1693 } 1836 }
1694 } 1837 }
1695 else 1838 else
1696 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1697 } 1840 }
1698} 1841}
1699 OUTPUT: 1842 OUTPUT:
1700 RETVAL 1843 RETVAL
1701 1844
1702SV * 1845SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1847 CODE:
1705{ 1848{
1706 int x1, x; 1849 int x1, x;
1707 int y1, y; 1850 int y1, y;
1708 int z; 1851 int z;
1753} 1896}
1754 OUTPUT: 1897 OUTPUT:
1755 RETVAL 1898 RETVAL
1756 1899
1757void 1900void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 1902 CODE:
1760{ 1903{
1761 int x, y, z; 1904 int x, y, z;
1762 1905
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 1909 smooth_key skey;
1767 1910 int pl_x, pl_y;
1911 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1912 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1913 rc_key_t key;
1770 rc_array_t *arr; 1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1771 1917
1772 // thats current max. sorry. 1918 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1775 1921
1830 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1831 1977
1832 if (tile) 1978 if (tile)
1833 { 1979 {
1834 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1835 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1836 1983
1837 if (key.texname != tex.name) 1984 if (key.texname != tex.name)
1838 { 1985 {
1839 if (!tex.name) 1986 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1841 1988
1842 key.texname = tex.name; 1989 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 1990 arr = rc_array (rc, &key);
1844 } 1991 }
1845 1992
1846 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
1848 2000
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853 2005
1854 if (cell->flags && z == 2) 2006 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 2007 {
1856 // overlays such as the speech bubble, probably more to come 2008 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 2009 if (cell->flags & 1)
1858 { 2010 {
1859 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
1998 } 2150 }
1999 2151
2000 hv_clear (smooth); 2152 hv_clear (smooth);
2001 } 2153 }
2002 2154
2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
2160
2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
2003 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2004 rc_free (rc); 2173 rc_free (rc);
2005 2174
2006 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
2034 } 2203 }
2035 } 2204 }
2036} 2205}
2037 2206
2038void 2207void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2209 CODE:
2041{ 2210{
2042 static float color[16][3] = { 2211 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
2096} 2265}
2097 2266
2098void 2267void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2269 PPCODE:
2101{ 2270{
2102 int x, y; 2271 int x, y;
2103 int sw1 = sw + 2; 2272 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2273 int sh1 = sh + 2;
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2113 2282
2114 mx += self->x - 1; 2283 mx += self->x - 1;
2115 my += self->y - 1; 2284 my += self->y - 1;
2116 2285
2117 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2118 2287
2119 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2121 { 2290 {
2122 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2345 PUSHs (darkness3_sv);
2177} 2346}
2178 2347
2179SV * 2348SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2350 CODE:
2182{ 2351{
2183 int x, y, x1, y1; 2352 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2411 else
2243 *data++ = 0; 2412 *data++ = 0;
2244 } 2413 }
2245 } 2414 }
2246 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2247 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2249 RETVAL = data_sv; 2423 RETVAL = data_sv;
2250} 2424}
2251 OUTPUT: 2425 OUTPUT:
2252 RETVAL 2426 RETVAL
2253 2427
2254void 2428void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2430 PPCODE:
2257{ 2431{
2258 int x, y, z; 2432 int x, y, z;
2259 int w, h; 2433 int w, h;
2260 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2261 2445
2262 if (*data++ != 0) 2446 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2264 2448
2265 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2280 { 2464 {
2281 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2282 2466
2283 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2284 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2285 uint8_t flags = *data++; 2474 flags = *data++;
2286 2475
2287 if (flags) 2476 if (flags)
2288 { 2477 {
2289 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2484
2296 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2297 { 2486 {
2298 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2299 2489
2300 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2301 { 2491 {
2302 tileid t = tile [z]; 2492 tileid t = tile [z];
2303 2493
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2495 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2497 need_texid (self, t);
2308 } 2498 }
2309 2499
2310 cell->tile [z] = t; 2500 cell->tile [z] = t;
2311 } 2501 }
2313 } 2503 }
2314 } 2504 }
2315 } 2505 }
2316} 2506}
2317 2507
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2509
2320CFPlus::RW 2510DC::RW
2321new (SV *class, SV *data_sv) 2511new (SV *class, SV *data_sv)
2322 CODE: 2512 CODE:
2323{ 2513{
2324 STRLEN datalen; 2514 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2515 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2518}
2329 OUTPUT: 2519 OUTPUT:
2330 RETVAL 2520 RETVAL
2331 2521
2332CFPlus::RW 2522DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2524 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2525 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2526 OUTPUT:
2337 RETVAL 2527 RETVAL
2338 2528
2339# fails on win32: 2529# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2530# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2531#void
2342#close (CFPlus::RW self) 2532#close (DC::RW self)
2343# CODE: 2533# CODE:
2344# (self->(close)) (self); 2534# (self->(close)) (self);
2345 2535
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2537
2348PROTOTYPES: DISABLE 2538PROTOTYPES: DISABLE
2349 2539
2350CFPlus::Channel 2540DC::Channel
2351find () 2541find ()
2352 CODE: 2542 CODE:
2353{ 2543{
2354 RETVAL = Mix_GroupAvailable (-1); 2544 RETVAL = Mix_GroupAvailable (-1);
2355 2545
2368} 2558}
2369 OUTPUT: 2559 OUTPUT:
2370 RETVAL 2560 RETVAL
2371 2561
2372void 2562void
2373halt (CFPlus::Channel self) 2563halt (DC::Channel self)
2374 CODE: 2564 CODE:
2375 Mix_HaltChannel (self); 2565 Mix_HaltChannel (self);
2376 2566
2377void 2567void
2378expire (CFPlus::Channel self, int ticks = -1) 2568expire (DC::Channel self, int ticks = -1)
2379 CODE: 2569 CODE:
2380 Mix_ExpireChannel (self, ticks); 2570 Mix_ExpireChannel (self, ticks);
2381 2571
2382void 2572void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2573fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2574 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2575 Mix_FadeOutChannel (self, ticks);
2386 2576
2387int 2577int
2388volume (CFPlus::Channel self, int volume) 2578volume (DC::Channel self, int volume)
2389 CODE: 2579 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2581 OUTPUT:
2392 RETVAL 2582 RETVAL
2393 2583
2394void 2584void
2395unregister_all_effects (CFPlus::Channel self) 2585unregister_all_effects (DC::Channel self)
2396 CODE: 2586 CODE:
2397 Mix_UnregisterAllEffects (self); 2587 Mix_UnregisterAllEffects (self);
2398 2588
2399void 2589void
2400set_panning (CFPlus::Channel self, int left, int right) 2590set_panning (DC::Channel self, int left, int right)
2401 CODE: 2591 CODE:
2402 left = CLAMP (left , 0, 255); 2592 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2593 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2594 Mix_SetPanning (self, left, right);
2405 2595
2406void 2596void
2407set_distance (CFPlus::Channel self, int distance) 2597set_distance (DC::Channel self, int distance)
2408 CODE: 2598 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2600
2411void 2601void
2412set_position (CFPlus::Channel self, int angle, int distance) 2602set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2603 CODE:
2414 2604
2415void 2605void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2607 CODE:
2418{ 2608{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2612}
2423 2613
2424void 2614void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2615set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2616 CODE:
2427 Mix_SetReverseStereo (self, flip); 2617 Mix_SetReverseStereo (self, flip);
2428 2618
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2620
2431PROTOTYPES: DISABLE 2621PROTOTYPES: DISABLE
2432 2622
2433CFPlus::MixChunk 2623DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2624new (SV *class, DC::RW rwops)
2435 CODE: 2625 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2627 OUTPUT:
2438 RETVAL 2628 RETVAL
2439 2629
2440void 2630void
2441DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2442 CODE: 2632 CODE:
2443 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2444 2634
2445int 2635int
2446volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2637 CODE:
2448 if (items > 1) 2638 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2639 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2641 OUTPUT:
2452 RETVAL 2642 RETVAL
2453 2643
2454CFPlus::Channel 2644DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2646 CODE:
2457{ 2647{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2649
2460 if (RETVAL < 0) 2650 if (RETVAL < 0)
2467 } 2657 }
2468} 2658}
2469 OUTPUT: 2659 OUTPUT:
2470 RETVAL 2660 RETVAL
2471 2661
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2663
2474int 2664int
2475volume (int volume = -1) 2665volume (int volume = -1)
2476 PROTOTYPE: ;$ 2666 PROTOTYPE: ;$
2477 CODE: 2667 CODE:
2489void 2679void
2490halt () 2680halt ()
2491 CODE: 2681 CODE:
2492 Mix_HaltMusic (); 2682 Mix_HaltMusic ();
2493 2683
2494CFPlus::MixMusic 2684DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2685new (SV *class, DC::RW rwops)
2496 CODE: 2686 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2688 OUTPUT:
2499 RETVAL 2689 RETVAL
2500 2690
2501void 2691void
2502DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2503 CODE: 2693 CODE:
2504 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2505 2695
2506int 2696int
2507play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2508 CODE: 2698 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2700 OUTPUT:
2511 RETVAL 2701 RETVAL
2512 2702
2513void 2703void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2705 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2707
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2709
2520PROTOTYPES: ENABLE 2710PROTOTYPES: ENABLE
2521 2711
2522BOOT: 2712BOOT:
2523{ 2713{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2715 static const struct {
2526 const char *name; 2716 const char *name;
2527 IV iv; 2717 IV iv;
2528 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3013 CODE:
2824 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3016
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3018
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3020
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3022
2858 3048
2859void glEndList () 3049void glEndList ()
2860 3050
2861void glCallList (int list) 3051void glCallList (int list)
2862 3052
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3054
2865PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2866 3056
2867void 3057void
2868find_widget (SV *self, NV x, NV y) 3058find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3062 XPUSHs (self);
2873} 3063}
2874 3064
2875BOOT: 3065BOOT:
2876{ 3066{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3068
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3073}
2884 3074
2885void 3075void
2886draw (SV *self) 3076draw (SV *self)
2887 CODE: 3077 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3084 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3085 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3086 double draw_x, draw_y;
2897 3087
2898 if (!SvROK (self)) 3088 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3090
2901 hv = (HV *)SvRV (self); 3091 hv = (HV *)SvRV (self);
2902 3092
2903 if (SvTYPE (hv) != SVt_PVHV) 3093 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3095
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3098
2909 if (!h || !w) 3099 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines