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.241 by root, Wed Dec 26 20:46:39 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 dc__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *dc__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *dc__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *dc__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *dc__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 dc__Font font; 176 DC__Font font;
155 rc_t *rc; 177 rc_t *rc;
156} *dc__Layout; 178} *DC__Layout;
157 179
158static dc__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 (dc__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 (dc__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} *dc__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 (dc__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 (dc__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 (dc__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 (dc__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
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
503MODULE = Deliantra::Client PACKAGE = dc 570MODULE = Deliantra::Client PACKAGE = DC
504 571
505PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
506 573
507BOOT: 574BOOT:
508{ 575{
509 HV *stash = gv_stashpv ("dc", 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 >= 800 && (*m)->h >= 600) 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));
752SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
753 913
754int 914int
755SDL_GetAppState () 915SDL_GetAppState ()
756 916
917int
918SDL_GetModState ()
919
757void 920void
758poll_events () 921poll_events ()
759 PPCODE: 922 PPCODE:
760{ 923{
761 SDL_Event ev; 924 SDL_Event ev;
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 ("dc::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
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 = Deliantra::Client PACKAGE = dc::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1194
1030PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
1031 1196
1032dc::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 (dc::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 (dc::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 = Deliantra::Client PACKAGE = dc::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1221
1057PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1058 1223
1059void 1224void
1060glyph_cache_backup () 1225glyph_cache_backup ()
1066glyph_cache_restore () 1231glyph_cache_restore ()
1067 PROTOTYPE: 1232 PROTOTYPE:
1068 CODE: 1233 CODE:
1069 tc_restore (); 1234 tc_restore ();
1070 1235
1071dc::Layout 1236DC::Layout
1072new (SV *class) 1237new (SV *class)
1073 CODE: 1238 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1075 1240
1076 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1087 OUTPUT: 1252 OUTPUT:
1088 RETVAL 1253 RETVAL
1089 1254
1090void 1255void
1091DESTROY (dc::Layout self) 1256DESTROY (DC::Layout self)
1092 CODE: 1257 CODE:
1093 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1094 rc_free (self->rc); 1259 rc_free (self->rc);
1095 Safefree (self); 1260 Safefree (self);
1096 1261
1097void 1262void
1098set_text (dc::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1099 CODE: 1264 CODE:
1100{ 1265{
1101 STRLEN textlen; 1266 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1103 1268
1104 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1105} 1270}
1106 1271
1107void 1272void
1108set_markup (dc::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1109 CODE: 1274 CODE:
1110{ 1275{
1111 STRLEN textlen; 1276 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1113 1278
1114 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1115} 1280}
1116 1281
1117void 1282void
1118set_shapes (dc::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1119 CODE: 1284 CODE:
1120{ 1285{
1121 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1288 const char *pos = text;
1158 if (attrs) 1323 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1160} 1325}
1161 1326
1162void 1327void
1163get_shapes (dc::Layout self) 1328get_shapes (DC::Layout self)
1164 PPCODE: 1329 PPCODE:
1165{ 1330{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1332
1168 do 1333 do
1169 { 1334 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1336
1172 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1173 { 1338 {
1174 PangoRectangle extents; 1339 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1348
1184 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1185} 1350}
1186 1351
1187int 1352int
1188has_wrapped (dc::Layout self) 1353has_wrapped (DC::Layout self)
1189 CODE: 1354 CODE:
1190{ 1355{
1191 int lines = 1; 1356 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1193 1358
1198} 1363}
1199 OUTPUT: 1364 OUTPUT:
1200 RETVAL 1365 RETVAL
1201 1366
1202SV * 1367SV *
1203get_text (dc::Layout self) 1368get_text (DC::Layout self)
1204 CODE: 1369 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1372 OUTPUT:
1208 RETVAL 1373 RETVAL
1209 1374
1210void 1375void
1211set_foreground (dc::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.)
1212 CODE: 1377 CODE:
1213 self->r = r; 1378 self->r = r;
1214 self->g = g; 1379 self->g = g;
1215 self->b = b; 1380 self->b = b;
1216 self->a = a; 1381 self->a = a;
1217 1382
1218void 1383void
1219set_font (dc::Layout self, dc::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1385 CODE:
1221 if (self->font != font) 1386 if (self->font != font)
1222 { 1387 {
1223 self->font = font; 1388 self->font = font;
1224 layout_update_font (self); 1389 layout_update_font (self);
1225 } 1390 }
1226 1391
1227void 1392void
1228set_height (dc::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1229 CODE: 1394 CODE:
1230 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1231 { 1396 {
1232 self->base_height = base_height; 1397 self->base_height = base_height;
1233 layout_update_font (self); 1398 layout_update_font (self);
1234 } 1399 }
1235 1400
1236void 1401void
1237set_width (dc::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1403 CODE:
1239 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);
1240 1405
1241void 1406void
1242set_indent (dc::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1243 CODE: 1408 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1410
1246void 1411void
1247set_spacing (dc::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1248 CODE: 1413 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1415
1251void 1416void
1252set_ellipsise (dc::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1418 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1259 ); 1424 );
1260 1425
1261void 1426void
1262set_single_paragraph_mode (dc::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1428 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1430
1266void 1431void
1267size (dc::Layout self) 1432size (DC::Layout self)
1268 PPCODE: 1433 PPCODE:
1269{ 1434{
1270 int w, h; 1435 int w, h;
1271 1436
1272 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1277} 1442}
1278 1443
1279int 1444int
1280descent (dc::Layout self) 1445descent (DC::Layout self)
1281 CODE: 1446 CODE:
1282{ 1447{
1283 PangoRectangle rect; 1448 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1287} 1452}
1288 OUTPUT: 1453 OUTPUT:
1289 RETVAL 1454 RETVAL
1290 1455
1291int 1456int
1292xy_to_index (dc::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1458 CODE:
1294{ 1459{
1295 int index, trailing; 1460 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1298} 1463}
1299 OUTPUT: 1464 OUTPUT:
1300 RETVAL 1465 RETVAL
1301 1466
1302void 1467void
1303cursor_pos (dc::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1469 PPCODE:
1305{ 1470{
1306 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1473
1309 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1478}
1314 1479
1315void 1480void
1316index_to_line_x (dc::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1482 PPCODE:
1318{ 1483{
1319 int line, x; 1484 int line, x;
1320 1485
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1489 --line;
1490#endif
1324 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1494}
1328 1495
1329void 1496void
1330line_x_to_index (dc::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1498 PPCODE:
1332{ 1499{
1333 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1334 int index, trailing; 1501 int index, trailing;
1335 1502
1336 if (line < 0) 1503 if (line < 0)
1337 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1338 1505
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1341 1508
1342 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);
1343 1510
1344 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1518 }
1352} 1519}
1353 1520
1354void 1521void
1355render (dc::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1523 CODE:
1357 rc_clear (self->rc); 1524 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1359 self->pl, 1526 self->pl,
1360 self->rc, 1527 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1532 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1533 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1534 pango_layout_context_changed (self->pl);
1368 1535
1369void 1536void
1370draw (dc::Layout self) 1537draw (DC::Layout self)
1371 CODE: 1538 CODE:
1372{ 1539{
1373 glEnable (GL_TEXTURE_2D); 1540 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1542 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1550 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1551 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1552 glDisable (GL_TEXTURE_2D);
1386} 1553}
1387 1554
1388MODULE = Deliantra::Client PACKAGE = dc::Texture 1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1556
1390PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1391 1558
1392void 1559void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1639 RETVAL = width > 0;
1473} 1640}
1474 OUTPUT: 1641 OUTPUT:
1475 RETVAL 1642 RETVAL
1476 1643
1477MODULE = Deliantra::Client PACKAGE = dc::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1645
1479PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1480 1647
1481dc::Map 1648DC::Map
1482new (SV *class) 1649new (SV *class)
1483 CODE: 1650 CODE:
1484 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1652 RETVAL->x = 0;
1486 RETVAL->y = 0; 1653 RETVAL->y = 0;
1494 RETVAL->row = 0; 1661 RETVAL->row = 0;
1495 OUTPUT: 1662 OUTPUT:
1496 RETVAL 1663 RETVAL
1497 1664
1498void 1665void
1499DESTROY (dc::Map self) 1666DESTROY (DC::Map self)
1500 CODE: 1667 CODE:
1501{ 1668{
1502 map_clear (self); 1669 map_clear (self);
1503 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1504 Safefree (self->tex); 1671 Safefree (self->tex);
1505 Safefree (self); 1672 Safefree (self);
1506} 1673}
1507 1674
1508void 1675void
1509resize (dc::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1677 CODE:
1511 self->w = map_width; 1678 self->w = map_width;
1512 self->h = map_height; 1679 self->h = map_height;
1513 1680
1514void 1681void
1515clear (dc::Map self) 1682clear (DC::Map self)
1516 CODE: 1683 CODE:
1517 map_clear (self); 1684 map_clear (self);
1518 1685
1519void 1686void
1520set_tileid (dc::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1688 CODE:
1522{ 1689{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1691 need_texid (self, tile);
1525} 1692}
1526 1693
1527void 1694void
1528set_smooth (dc::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1696 CODE:
1530{ 1697{
1531 tileid texid; 1698 tileid texid;
1532 maptex *tex; 1699 maptex *tex;
1533 1700
1546 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1548} 1715}
1549 1716
1550void 1717void
1551set_texture (dc::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)
1552 CODE: 1719 CODE:
1553{ 1720{
1554 need_texid (self, texid); 1721 need_texid (self, texid);
1555 1722
1556 { 1723 {
1576 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1745}
1579 1746
1580int 1747int
1581ox (dc::Map self) 1748ox (DC::Map self)
1582 ALIAS: 1749 ALIAS:
1583 oy = 1 1750 oy = 1
1584 x = 2 1751 x = 2
1585 y = 3 1752 y = 3
1586 w = 4 1753 w = 4
1597 } 1764 }
1598 OUTPUT: 1765 OUTPUT:
1599 RETVAL 1766 RETVAL
1600 1767
1601void 1768void
1602scroll (dc::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1603 CODE: 1770 CODE:
1604{ 1771{
1605 if (dx > 0) 1772 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1774 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1624 } 1791 }
1625} 1792}
1626 1793
1627SV * 1794SV *
1628map1a_update (dc::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1796 CODE:
1630{ 1797{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1800 mapcell *cell;
1661 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1662 1829
1663 do 1830 do
1664 { 1831 {
1665 ext = *data++; 1832 ext = *data++;
1666 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1667 1834
1668 if (cmd < 4) 1835 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1671 { 1838 {
1674 } 1841 }
1675 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1678 { 1845 {
1679 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1850
1682 data += *data + 1; 1851 data += *data + 1;
1683 } 1852 }
1684 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1854 cell->flags = *data++;
1715 } 1884 }
1716 } 1885 }
1717 } 1886 }
1718 } 1887 }
1719 else 1888 else
1720 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1721 } 1890 }
1722} 1891}
1723 OUTPUT: 1892 OUTPUT:
1724 RETVAL 1893 RETVAL
1725 1894
1726SV * 1895SV *
1727mapmap (dc::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1897 CODE:
1729{ 1898{
1730 int x1, x; 1899 int x1, x;
1731 int y1, y; 1900 int y1, y;
1732 int z; 1901 int z;
1777} 1946}
1778 OUTPUT: 1947 OUTPUT:
1779 RETVAL 1948 RETVAL
1780 1949
1781void 1950void
1782draw (dc::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)
1783 CODE: 1952 CODE:
1784{ 1953{
1785 int x, y, z; 1954 int x, y, z;
1786 1955
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 1959 smooth_key skey;
1791 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1963 rc_key_t key;
1794 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1795 1967
1796 // thats current max. sorry. 1968 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1799 1971
1854 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1855 2027
1856 if (tile) 2028 if (tile)
1857 { 2029 {
1858 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1859 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1860 2033
1861 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1862 { 2035 {
1863 if (!tex.name) 2036 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1865 2038
1866 key.texname = tex.name; 2039 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1868 } 2041 }
1869 2042
1870 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1872 2050
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877 2055
1878 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2057 {
1880 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2059 if (cell->flags & 1)
1882 { 2060 {
1883 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
2022 } 2200 }
2023 2201
2024 hv_clear (smooth); 2202 hv_clear (smooth);
2025 } 2203 }
2026 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
2027 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2028 rc_free (rc); 2223 rc_free (rc);
2029 2224
2030 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
2058 } 2253 }
2059 } 2254 }
2060} 2255}
2061 2256
2062void 2257void
2063draw_magicmap (dc::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)
2064 CODE: 2259 CODE:
2065{ 2260{
2066 static float color[16][3] = { 2261 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2120} 2315}
2121 2316
2122void 2317void
2123fow_texture (dc::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2319 PPCODE:
2125{ 2320{
2126 int x, y; 2321 int x, y;
2127 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2332
2138 mx += self->x - 1; 2333 mx += self->x - 1;
2139 my += self->y - 1; 2334 my += self->y - 1;
2140 2335
2141 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2337
2143 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2145 { 2340 {
2146 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2201} 2396}
2202 2397
2203SV * 2398SV *
2204get_rect (dc::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2400 CODE:
2206{ 2401{
2207 int x, y, x1, y1; 2402 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2461 else
2267 *data++ = 0; 2462 *data++ = 0;
2268 } 2463 }
2269 } 2464 }
2270 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 {
2271 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2273 RETVAL = data_sv; 2473 RETVAL = data_sv;
2274} 2474}
2275 OUTPUT: 2475 OUTPUT:
2276 RETVAL 2476 RETVAL
2277 2477
2278void 2478void
2279set_rect (dc::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2480 PPCODE:
2281{ 2481{
2282 int x, y, z; 2482 int x, y, z;
2283 int w, h; 2483 int w, h;
2284 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;
2285 2495
2286 if (*data++ != 0) 2496 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2288 2498
2289 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2304 { 2514 {
2305 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2306 2516
2307 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2308 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2309 uint8_t flags = *data++; 2524 flags = *data++;
2310 2525
2311 if (flags) 2526 if (flags)
2312 { 2527 {
2313 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2534
2320 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2321 { 2536 {
2322 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2323 2539
2324 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2325 { 2541 {
2326 tileid t = tile [z]; 2542 tileid t = tile [z];
2327 2543
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2545 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2547 need_texid (self, t);
2332 } 2548 }
2333 2549
2334 cell->tile [z] = t; 2550 cell->tile [z] = t;
2335 } 2551 }
2337 } 2553 }
2338 } 2554 }
2339 } 2555 }
2340} 2556}
2341 2557
2342MODULE = Deliantra::Client PACKAGE = dc::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2559
2344dc::RW 2560DC::RW
2345new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2346 CODE: 2562 CODE:
2347{ 2563{
2348 STRLEN datalen; 2564 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2568}
2353 OUTPUT: 2569 OUTPUT:
2354 RETVAL 2570 RETVAL
2355 2571
2356dc::RW 2572DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2574 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2576 OUTPUT:
2361 RETVAL 2577 RETVAL
2362 2578
2363# fails on win32: 2579# fails on win32:
2364# dc.xs(2268) : error C2059: syntax error : '(' 2580# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2581#void
2366#close (dc::RW self) 2582#close (DC::RW self)
2367# CODE: 2583# CODE:
2368# (self->(close)) (self); 2584# (self->(close)) (self);
2369 2585
2370MODULE = Deliantra::Client PACKAGE = dc::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2587
2372PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2373 2589
2374dc::Channel 2590DC::Channel
2375find () 2591find ()
2376 CODE: 2592 CODE:
2377{ 2593{
2378 RETVAL = Mix_GroupAvailable (-1); 2594 RETVAL = Mix_GroupAvailable (-1);
2379 2595
2392} 2608}
2393 OUTPUT: 2609 OUTPUT:
2394 RETVAL 2610 RETVAL
2395 2611
2396void 2612void
2397halt (dc::Channel self) 2613halt (DC::Channel self)
2398 CODE: 2614 CODE:
2399 Mix_HaltChannel (self); 2615 Mix_HaltChannel (self);
2400 2616
2401void 2617void
2402expire (dc::Channel self, int ticks = -1) 2618expire (DC::Channel self, int ticks = -1)
2403 CODE: 2619 CODE:
2404 Mix_ExpireChannel (self, ticks); 2620 Mix_ExpireChannel (self, ticks);
2405 2621
2406void 2622void
2407fade_out (dc::Channel self, int ticks = -1) 2623fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2624 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2625 Mix_FadeOutChannel (self, ticks);
2410 2626
2411int 2627int
2412volume (dc::Channel self, int volume) 2628volume (DC::Channel self, int volume)
2413 CODE: 2629 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2631 OUTPUT:
2416 RETVAL 2632 RETVAL
2417 2633
2418void 2634void
2419unregister_all_effects (dc::Channel self) 2635unregister_all_effects (DC::Channel self)
2420 CODE: 2636 CODE:
2421 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2422 2638
2423void 2639void
2424set_panning (dc::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2425 CODE: 2641 CODE:
2426 left = CLAMP (left , 0, 255); 2642 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2643 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2429 2645
2430void 2646void
2431set_distance (dc::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2432 CODE: 2648 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2650
2435void 2651void
2436set_position (dc::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2653 CODE:
2438 2654
2439void 2655void
2440set_position_r (dc::Channel self, int dx, int dy, int maxdistance) 2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2657 CODE:
2442{ 2658{
2443 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));
2444 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);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2662}
2447 2663
2448void 2664void
2449set_reverse_stereo (dc::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2666 CODE:
2451 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2452 2668
2453MODULE = Deliantra::Client PACKAGE = dc::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2670
2455PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2456 2672
2457dc::MixChunk 2673DC::MixChunk
2458new (SV *class, dc::RW rwops) 2674new (SV *class, DC::RW rwops)
2459 CODE: 2675 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2677 OUTPUT:
2462 RETVAL 2678 RETVAL
2463 2679
2464void 2680void
2465DESTROY (dc::MixChunk self) 2681DESTROY (DC::MixChunk self)
2466 CODE: 2682 CODE:
2467 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2468 2684
2469int 2685int
2470volume (dc::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2687 CODE:
2472 if (items > 1) 2688 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2689 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2691 OUTPUT:
2476 RETVAL 2692 RETVAL
2477 2693
2478dc::Channel 2694DC::Channel
2479play (dc::MixChunk self, dc::Channel channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2696 CODE:
2481{ 2697{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2699
2484 if (RETVAL < 0) 2700 if (RETVAL < 0)
2491 } 2707 }
2492} 2708}
2493 OUTPUT: 2709 OUTPUT:
2494 RETVAL 2710 RETVAL
2495 2711
2496MODULE = Deliantra::Client PACKAGE = dc::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2713
2498int 2714int
2499volume (int volume = -1) 2715volume (int volume = -1)
2500 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2501 CODE: 2717 CODE:
2513void 2729void
2514halt () 2730halt ()
2515 CODE: 2731 CODE:
2516 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2517 2733
2518dc::MixMusic 2734DC::MixMusic
2519new (SV *class, dc::RW rwops) 2735new (SV *class, DC::RW rwops)
2520 CODE: 2736 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2738 OUTPUT:
2523 RETVAL 2739 RETVAL
2524 2740
2525void 2741void
2526DESTROY (dc::MixMusic self) 2742DESTROY (DC::MixMusic self)
2527 CODE: 2743 CODE:
2528 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2529 2745
2530int 2746int
2531play (dc::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2532 CODE: 2748 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2750 OUTPUT:
2535 RETVAL 2751 RETVAL
2536 2752
2537void 2753void
2538fade_in_pos (dc::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2755 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2757
2542MODULE = Deliantra::Client PACKAGE = dc::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2759
2544PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2545 2761
2546BOOT: 2762BOOT:
2547{ 2763{
2548 HV *stash = gv_stashpv ("dc::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2765 static const struct {
2550 const char *name; 2766 const char *name;
2551 IV iv; 2767 IV iv;
2552 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2846void 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)
2847 CODE: 3063 CODE:
2848 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3066
2851void 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)
2852 3068
2853void 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)
2854 3070
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3072
2882 3098
2883void glEndList () 3099void glEndList ()
2884 3100
2885void glCallList (int list) 3101void glCallList (int list)
2886 3102
2887MODULE = Deliantra::Client PACKAGE = dc::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3104
2889PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2890 3106
2891void 3107void
2892find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3112 XPUSHs (self);
2897} 3113}
2898 3114
2899BOOT: 3115BOOT:
2900{ 3116{
2901 hover_gv = gv_fetchpv ("dc::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3118
2903 draw_x_gv = gv_fetchpv ("dc::UI::Base::draw_x", 1, SVt_NV); 3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("dc::UI::Base::draw_y", 1, SVt_NV); 3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("dc::UI::Base::draw_w", 1, SVt_NV); 3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("dc::UI::Base::draw_h", 1, SVt_NV); 3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3123}
2908 3124
2909void 3125void
2910draw (SV *self) 3126draw (SV *self)
2911 CODE: 3127 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3136 double draw_x, draw_y;
2921 3137
2922 if (!SvROK (self)) 3138 if (!SvROK (self))
2923 croak ("dc::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3140
2925 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2926 3142
2927 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("dc::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3145
2930 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.;
2931 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.;
2932 3148
2933 if (!h || !w) 3149 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines