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.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 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 }
535 const_iv (SDL_USEREVENT), 602 const_iv (SDL_USEREVENT),
536 603
537 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
540 657
541 const_iv (SDLK_FIRST), 658 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 659 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
621 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
624 741
625 const_iv (MIX_DEFAULT_FORMAT), 742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
626# undef const_iv 772# undef const_iv
627 }; 773 };
628 774
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 805 CODE:
660{ 806{
661 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
664} 815}
665 816
666char *
667SDL_GetError () 817char *SDL_GetError ()
668 818
669int 819void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 820
672void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
673SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
674 837
675void 838void
676SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
677 PPCODE: 840 PPCODE:
678{ 841{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 856
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 859
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 861
702 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
703 while (*m) 863 while (*m)
704 { 864 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 866 {
707 AV *av = newAV (); 867 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
734 894
735 if (RETVAL) 895 if (RETVAL)
736 { 896 {
737 av_clear (texture_av); 897 av_clear (texture_av);
738 898
739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 901#include "glfunc.h"
742#undef GL_FUNC 902#undef GL_FUNC
743 } 903 }
744} 904}
751char * 911char *
752SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
753 913
754int 914int
755SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
756 919
757void 920void
758poll_events () 921poll_events ()
759 PPCODE: 922 PPCODE:
760{ 923{
770 { 933 {
771 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
772 case SDL_KEYUP: 935 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 941 break;
779 942
780 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 962 x = ev.motion.x;
800 y = ev.motion.y; 963 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 965 }
803 966
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 973 }
811 break; 974 break;
812 975
813 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 979
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 990 break;
828 } 991 }
829 992
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 994 }
832} 995}
833 996
834int 997int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1057 }
895 } 1058 }
896#endif 1059#endif
897} 1060}
898 1061
899void 1062int
900add_font (char *file) 1063add_font (char *file)
901 CODE: 1064 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
903 1068
904void 1069void
905load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
906 ALIAS: 1071 ALIAS:
907 load_image_file = 1 1072 load_image_file = 1
993void 1158void
994error (char *message) 1159error (char *message)
995 CODE: 1160 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1162#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1164#endif
1000 1165
1001void 1166void
1002fatal (char *message) 1167fatal (char *message)
1003 CODE: 1168 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1170#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1172#endif
1008 _exit (1); 1173 _exit (1);
1009 1174
1010void 1175void
1011_exit (int retval = 0) 1176_exit (int retval = 0)
1023#if DEBUG 1188#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
1025#endif 1190#endif
1026} 1191}
1027 1192
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1194
1030PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
1031 1196
1032CFPlus::Font 1197DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1199 CODE:
1035{ 1200{
1036 int count; 1201 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1205}
1041 OUTPUT: 1206 OUTPUT:
1042 RETVAL 1207 RETVAL
1043 1208
1044void 1209void
1045DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
1046 CODE: 1211 CODE:
1047 pango_font_description_free (self); 1212 pango_font_description_free (self);
1048 1213
1049void 1214void
1050make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1051 PROTOTYPE: $ 1216 PROTOTYPE: $
1052 CODE: 1217 CODE:
1053 default_font = self; 1218 default_font = self;
1054 1219
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1221
1057PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1058 1223
1059void 1224void
1060reset_glyph_cache () 1225glyph_cache_backup ()
1061 PROTOTYPE: 1226 PROTOTYPE:
1062 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
1063 tc_clear (); 1234 tc_restore ();
1064 1235
1065CFPlus::Layout 1236DC::Layout
1066new (SV *class) 1237new (SV *class)
1067 CODE: 1238 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1069 1240
1070 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1081 OUTPUT: 1252 OUTPUT:
1082 RETVAL 1253 RETVAL
1083 1254
1084void 1255void
1085DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
1086 CODE: 1257 CODE:
1087 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1088 rc_free (self->rc); 1259 rc_free (self->rc);
1089 Safefree (self); 1260 Safefree (self);
1090 1261
1091void 1262void
1092set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1093 CODE: 1264 CODE:
1094{ 1265{
1095 STRLEN textlen; 1266 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1097 1268
1098 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1099} 1270}
1100 1271
1101void 1272void
1102set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1103 CODE: 1274 CODE:
1104{ 1275{
1105 STRLEN textlen; 1276 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1107 1278
1108 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1109} 1280}
1110 1281
1111void 1282void
1112set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1113 CODE: 1284 CODE:
1114{ 1285{
1115 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1288 const char *pos = text;
1152 if (attrs) 1323 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1154} 1325}
1155 1326
1156void 1327void
1157get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1158 PPCODE: 1329 PPCODE:
1159{ 1330{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1332
1162 do 1333 do
1163 { 1334 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1336
1166 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1167 { 1338 {
1168 PangoRectangle extents; 1339 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1348
1178 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1179} 1350}
1180 1351
1181int 1352int
1182has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1183 CODE: 1354 CODE:
1184{ 1355{
1185 int lines = 1; 1356 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1187 1358
1192} 1363}
1193 OUTPUT: 1364 OUTPUT:
1194 RETVAL 1365 RETVAL
1195 1366
1196SV * 1367SV *
1197get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1198 CODE: 1369 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1372 OUTPUT:
1202 RETVAL 1373 RETVAL
1203 1374
1204void 1375void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1377 CODE:
1207 self->r = r; 1378 self->r = r;
1208 self->g = g; 1379 self->g = g;
1209 self->b = b; 1380 self->b = b;
1210 self->a = a; 1381 self->a = a;
1211 1382
1212void 1383void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1385 CODE:
1215 if (self->font != font) 1386 if (self->font != font)
1216 { 1387 {
1217 self->font = font; 1388 self->font = font;
1218 layout_update_font (self); 1389 layout_update_font (self);
1219 } 1390 }
1220 1391
1221void 1392void
1222set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1223 CODE: 1394 CODE:
1224 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1225 { 1396 {
1226 self->base_height = base_height; 1397 self->base_height = base_height;
1227 layout_update_font (self); 1398 layout_update_font (self);
1228 } 1399 }
1229 1400
1230void 1401void
1231set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1403 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1405
1235void 1406void
1236set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1237 CODE: 1408 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1410
1240void 1411void
1241set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1242 CODE: 1413 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1415
1245void 1416void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1418 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1253 ); 1424 );
1254 1425
1255void 1426void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1428 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1430
1260void 1431void
1261size (CFPlus::Layout self) 1432size (DC::Layout self)
1262 PPCODE: 1433 PPCODE:
1263{ 1434{
1264 int w, h; 1435 int w, h;
1265 1436
1266 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1271} 1442}
1272 1443
1273int 1444int
1274descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1275 CODE: 1446 CODE:
1276{ 1447{
1277 PangoRectangle rect; 1448 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1281} 1452}
1282 OUTPUT: 1453 OUTPUT:
1283 RETVAL 1454 RETVAL
1284 1455
1285int 1456int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1458 CODE:
1288{ 1459{
1289 int index, trailing; 1460 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1292} 1463}
1293 OUTPUT: 1464 OUTPUT:
1294 RETVAL 1465 RETVAL
1295 1466
1296void 1467void
1297cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1469 PPCODE:
1299{ 1470{
1300 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1473
1303 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1478}
1308 1479
1309void 1480void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1482 PPCODE:
1312{ 1483{
1313 int line, x; 1484 int line, x;
1314 1485
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1489 --line;
1490#endif
1318 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1494}
1322 1495
1323void 1496void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1498 PPCODE:
1326{ 1499{
1327 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1328 int index, trailing; 1501 int index, trailing;
1329 1502
1330 if (line < 0) 1503 if (line < 0)
1331 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1332 1505
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1335 1508
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1510
1338 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1518 }
1346} 1519}
1347 1520
1348void 1521void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1523 CODE:
1351 rc_clear (self->rc); 1524 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1353 self->pl, 1526 self->pl,
1354 self->rc, 1527 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1532 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1533 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1534 pango_layout_context_changed (self->pl);
1362 1535
1363void 1536void
1364draw (CFPlus::Layout self) 1537draw (DC::Layout self)
1365 CODE: 1538 CODE:
1366{ 1539{
1367 glEnable (GL_TEXTURE_2D); 1540 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1542 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1550 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1551 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1552 glDisable (GL_TEXTURE_2D);
1380} 1553}
1381 1554
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1556
1384PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1385 1558
1386void 1559void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1639 RETVAL = width > 0;
1467} 1640}
1468 OUTPUT: 1641 OUTPUT:
1469 RETVAL 1642 RETVAL
1470 1643
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1645
1473PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1474 1647
1475CFPlus::Map 1648DC::Map
1476new (SV *class) 1649new (SV *class)
1477 CODE: 1650 CODE:
1478 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1652 RETVAL->x = 0;
1480 RETVAL->y = 0; 1653 RETVAL->y = 0;
1488 RETVAL->row = 0; 1661 RETVAL->row = 0;
1489 OUTPUT: 1662 OUTPUT:
1490 RETVAL 1663 RETVAL
1491 1664
1492void 1665void
1493DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1494 CODE: 1667 CODE:
1495{ 1668{
1496 map_clear (self); 1669 map_clear (self);
1497 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1498 Safefree (self->tex); 1671 Safefree (self->tex);
1499 Safefree (self); 1672 Safefree (self);
1500} 1673}
1501 1674
1502void 1675void
1503resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1677 CODE:
1505 self->w = map_width; 1678 self->w = map_width;
1506 self->h = map_height; 1679 self->h = map_height;
1507 1680
1508void 1681void
1509clear (CFPlus::Map self) 1682clear (DC::Map self)
1510 CODE: 1683 CODE:
1511 map_clear (self); 1684 map_clear (self);
1512 1685
1513void 1686void
1514set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1688 CODE:
1516{ 1689{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1691 need_texid (self, tile);
1519} 1692}
1520 1693
1521void 1694void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1696 CODE:
1524{ 1697{
1525 tileid texid; 1698 tileid texid;
1526 maptex *tex; 1699 maptex *tex;
1527 1700
1540 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1542} 1715}
1543 1716
1544void 1717void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1719 CODE:
1547{ 1720{
1548 need_texid (self, texid); 1721 need_texid (self, texid);
1549 1722
1550 { 1723 {
1570 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1745}
1573 1746
1574int 1747int
1575ox (CFPlus::Map self) 1748ox (DC::Map self)
1576 ALIAS: 1749 ALIAS:
1577 oy = 1 1750 oy = 1
1578 x = 2 1751 x = 2
1579 y = 3 1752 y = 3
1580 w = 4 1753 w = 4
1591 } 1764 }
1592 OUTPUT: 1765 OUTPUT:
1593 RETVAL 1766 RETVAL
1594 1767
1595void 1768void
1596scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1597 CODE: 1770 CODE:
1598{ 1771{
1599 if (dx > 0) 1772 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1774 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1618 } 1791 }
1619} 1792}
1620 1793
1621SV * 1794SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1796 CODE:
1624{ 1797{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1800 mapcell *cell;
1655 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1656 1829
1657 do 1830 do
1658 { 1831 {
1659 ext = *data++; 1832 ext = *data++;
1660 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1661 1834
1662 if (cmd < 4) 1835 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1665 { 1838 {
1668 } 1841 }
1669 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1672 { 1845 {
1673 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1850
1676 data += *data + 1; 1851 data += *data + 1;
1677 } 1852 }
1678 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1854 cell->flags = *data++;
1709 } 1884 }
1710 } 1885 }
1711 } 1886 }
1712 } 1887 }
1713 else 1888 else
1714 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1715 } 1890 }
1716} 1891}
1717 OUTPUT: 1892 OUTPUT:
1718 RETVAL 1893 RETVAL
1719 1894
1720SV * 1895SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1897 CODE:
1723{ 1898{
1724 int x1, x; 1899 int x1, x;
1725 int y1, y; 1900 int y1, y;
1726 int z; 1901 int z;
1771} 1946}
1772 OUTPUT: 1947 OUTPUT:
1773 RETVAL 1948 RETVAL
1774 1949
1775void 1950void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 1952 CODE:
1778{ 1953{
1779 int x, y, z; 1954 int x, y, z;
1780 1955
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 1959 smooth_key skey;
1785 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1963 rc_key_t key;
1788 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1789 1967
1790 // thats current max. sorry. 1968 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1793 1971
1848 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1849 2027
1850 if (tile) 2028 if (tile)
1851 { 2029 {
1852 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1853 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1854 2033
1855 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1856 { 2035 {
1857 if (!tex.name) 2036 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1859 2038
1860 key.texname = tex.name; 2039 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1862 } 2041 }
1863 2042
1864 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1866 2050
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 2055
1872 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 2057 {
1874 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 2059 if (cell->flags & 1)
1876 { 2060 {
1877 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
2016 } 2200 }
2017 2201
2018 hv_clear (smooth); 2202 hv_clear (smooth);
2019 } 2203 }
2020 2204
2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
2210
2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
2021 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2022 rc_free (rc); 2223 rc_free (rc);
2023 2224
2024 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
2052 } 2253 }
2053 } 2254 }
2054} 2255}
2055 2256
2056void 2257void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2259 CODE:
2059{ 2260{
2060 static float color[16][3] = { 2261 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2114} 2315}
2115 2316
2116void 2317void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2319 PPCODE:
2119{ 2320{
2120 int x, y; 2321 int x, y;
2121 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2332
2132 mx += self->x - 1; 2333 mx += self->x - 1;
2133 my += self->y - 1; 2334 my += self->y - 1;
2134 2335
2135 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2337
2137 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2139 { 2340 {
2140 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2195} 2396}
2196 2397
2197SV * 2398SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2400 CODE:
2200{ 2401{
2201 int x, y, x1, y1; 2402 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2461 else
2261 *data++ = 0; 2462 *data++ = 0;
2262 } 2463 }
2263 } 2464 }
2264 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2265 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2267 RETVAL = data_sv; 2473 RETVAL = data_sv;
2268} 2474}
2269 OUTPUT: 2475 OUTPUT:
2270 RETVAL 2476 RETVAL
2271 2477
2272void 2478void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2480 PPCODE:
2275{ 2481{
2276 int x, y, z; 2482 int x, y, z;
2277 int w, h; 2483 int w, h;
2278 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2279 2495
2280 if (*data++ != 0) 2496 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2282 2498
2283 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2298 { 2514 {
2299 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2300 2516
2301 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2302 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2303 uint8_t flags = *data++; 2524 flags = *data++;
2304 2525
2305 if (flags) 2526 if (flags)
2306 { 2527 {
2307 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2534
2314 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2315 { 2536 {
2316 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2317 2539
2318 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2319 { 2541 {
2320 tileid t = tile [z]; 2542 tileid t = tile [z];
2321 2543
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2545 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2547 need_texid (self, t);
2326 } 2548 }
2327 2549
2328 cell->tile [z] = t; 2550 cell->tile [z] = t;
2329 } 2551 }
2331 } 2553 }
2332 } 2554 }
2333 } 2555 }
2334} 2556}
2335 2557
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2559
2338CFPlus::RW 2560DC::RW
2339new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2340 CODE: 2562 CODE:
2341{ 2563{
2342 STRLEN datalen; 2564 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2568}
2347 OUTPUT: 2569 OUTPUT:
2348 RETVAL 2570 RETVAL
2349 2571
2350CFPlus::RW 2572DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2574 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2576 OUTPUT:
2355 RETVAL 2577 RETVAL
2356 2578
2357# fails on win32: 2579# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2580# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2581#void
2360#close (CFPlus::RW self) 2582#close (DC::RW self)
2361# CODE: 2583# CODE:
2362# (self->(close)) (self); 2584# (self->(close)) (self);
2363 2585
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2587
2366PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2367 2589
2368CFPlus::Channel 2590DC::Channel
2369find () 2591find ()
2370 CODE: 2592 CODE:
2371{ 2593{
2372 RETVAL = Mix_GroupAvailable (-1); 2594 RETVAL = Mix_GroupAvailable (-1);
2373 2595
2386} 2608}
2387 OUTPUT: 2609 OUTPUT:
2388 RETVAL 2610 RETVAL
2389 2611
2390void 2612void
2391halt (CFPlus::Channel self) 2613halt (DC::Channel self)
2392 CODE: 2614 CODE:
2393 Mix_HaltChannel (self); 2615 Mix_HaltChannel (self);
2394 2616
2395void 2617void
2396expire (CFPlus::Channel self, int ticks = -1) 2618expire (DC::Channel self, int ticks = -1)
2397 CODE: 2619 CODE:
2398 Mix_ExpireChannel (self, ticks); 2620 Mix_ExpireChannel (self, ticks);
2399 2621
2400void 2622void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2623fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2624 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2625 Mix_FadeOutChannel (self, ticks);
2404 2626
2405int 2627int
2406volume (CFPlus::Channel self, int volume) 2628volume (DC::Channel self, int volume)
2407 CODE: 2629 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2631 OUTPUT:
2410 RETVAL 2632 RETVAL
2411 2633
2412void 2634void
2413unregister_all_effects (CFPlus::Channel self) 2635unregister_all_effects (DC::Channel self)
2414 CODE: 2636 CODE:
2415 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2416 2638
2417void 2639void
2418set_panning (CFPlus::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2419 CODE: 2641 CODE:
2420 left = CLAMP (left , 0, 255); 2642 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2643 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2423 2645
2424void 2646void
2425set_distance (CFPlus::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2426 CODE: 2648 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2650
2429void 2651void
2430set_position (CFPlus::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2653 CODE:
2432 2654
2433void 2655void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2657 CODE:
2436{ 2658{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2662}
2441 2663
2442void 2664void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2666 CODE:
2445 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2446 2668
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2670
2449PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2450 2672
2451CFPlus::MixChunk 2673DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2674new (SV *class, DC::RW rwops)
2453 CODE: 2675 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2677 OUTPUT:
2456 RETVAL 2678 RETVAL
2457 2679
2458void 2680void
2459DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2460 CODE: 2682 CODE:
2461 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2462 2684
2463int 2685int
2464volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2687 CODE:
2466 if (items > 1) 2688 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2689 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2691 OUTPUT:
2470 RETVAL 2692 RETVAL
2471 2693
2472CFPlus::Channel 2694DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2696 CODE:
2475{ 2697{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2699
2478 if (RETVAL < 0) 2700 if (RETVAL < 0)
2485 } 2707 }
2486} 2708}
2487 OUTPUT: 2709 OUTPUT:
2488 RETVAL 2710 RETVAL
2489 2711
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2713
2492int 2714int
2493volume (int volume = -1) 2715volume (int volume = -1)
2494 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2495 CODE: 2717 CODE:
2507void 2729void
2508halt () 2730halt ()
2509 CODE: 2731 CODE:
2510 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2511 2733
2512CFPlus::MixMusic 2734DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2735new (SV *class, DC::RW rwops)
2514 CODE: 2736 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2738 OUTPUT:
2517 RETVAL 2739 RETVAL
2518 2740
2519void 2741void
2520DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2521 CODE: 2743 CODE:
2522 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2523 2745
2524int 2746int
2525play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2526 CODE: 2748 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2750 OUTPUT:
2529 RETVAL 2751 RETVAL
2530 2752
2531void 2753void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2755 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2757
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2759
2538PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2539 2761
2540BOOT: 2762BOOT:
2541{ 2763{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2765 static const struct {
2544 const char *name; 2766 const char *name;
2545 IV iv; 2767 IV iv;
2546 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3063 CODE:
2842 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3066
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3068
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3070
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3072
2876 3098
2877void glEndList () 3099void glEndList ()
2878 3100
2879void glCallList (int list) 3101void glCallList (int list)
2880 3102
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3104
2883PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2884 3106
2885void 3107void
2886find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3112 XPUSHs (self);
2891} 3113}
2892 3114
2893BOOT: 3115BOOT:
2894{ 3116{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3118
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3123}
2902 3124
2903void 3125void
2904draw (SV *self) 3126draw (SV *self)
2905 CODE: 3127 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3136 double draw_x, draw_y;
2915 3137
2916 if (!SvROK (self)) 3138 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3140
2919 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2920 3142
2921 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3145
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3148
2927 if (!h || !w) 3149 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines