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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif
73 97
74static AV *texture_av; 98static AV *texture_av;
75 99
76static struct 100static struct
77{ 101{
120 144
121#include "pango-font.c" 145#include "pango-font.c"
122#include "pango-fontmap.c" 146#include "pango-fontmap.c"
123#include "pango-render.c" 147#include "pango-render.c"
124 148
125typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
129 153
130typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
131 155
132static int 156static int
133shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
134{ 158{
135 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
149 173
150typedef struct cf_layout { 174typedef struct cf_layout {
151 PangoLayout *pl; 175 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
153 int base_height; 177 int base_height;
154 CFPlus__Font font; 178 DC__Font font;
155 rc_t *rc; 179 rc_t *rc;
156} *CFPlus__Layout; 180} *DC__Layout;
157 181
158static CFPlus__Font default_font; 182static DC__Font default_font;
159static PangoContext *opengl_context; 183static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
161 185
162static void 186static void
163substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
168#endif 192#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 194}
171 195
172static void 196static void
173layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
174{ 198{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
177 */ 201 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
179 203
180 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 206
183 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
184} 208}
185 209
186static void 210static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 212{
189 PangoRectangle rect; 213 PangoRectangle rect;
190 214
191 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
233 257
234 int32_t rows; 258 int32_t rows;
235 maprow *row; 259 maprow *row;
236} *CFPlus__Map; 260} *DC__Map;
237 261
238static char * 262static char *
239prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
240{ 264{
241 char *p; 265 char *p;
279 self->texs *= 2; 303 self->texs *= 2;
280 } 304 }
281} 305}
282 306
283static maprow * 307static maprow *
284map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
285{ 309{
286 if (0 > y) 310 if (0 > y)
287 { 311 {
288 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
327 351
328 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
329} 353}
330 354
331static mapcell * 355static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
333{ 357{
334 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
335} 359}
336 360
337static void 361static void
338map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
339{ 363{
340 int r; 364 int r;
341 365
342 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
350 self->oy = 0; 374 self->oy = 0;
351 self->row = 0; 375 self->row = 0;
352 self->rows = 0; 376 self->rows = 0;
353} 377}
354 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
355static void 389static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 391{
358 int x, y; 392 int x, y;
359 maprow *row; 393 maprow *row;
360 mapcell *cell; 394 mapcell *cell;
361 395
373 if (x >= row->c1) 407 if (x >= row->c1)
374 break; 408 break;
375 409
376 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
377 411
378 cell->darkness = 0; 412 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 413 }
383 } 414 }
384} 415}
385 416
386typedef struct { 417typedef struct {
498 return 0; 529 return 0;
499 530
500 return 1; 531 return 1;
501} 532}
502 533
503MODULE = CFPlus PACKAGE = CFPlus 534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
504 587
505PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
506 589
507BOOT: 590BOOT:
508{ 591{
509 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 593 static const struct {
511 const char *name; 594 const char *name;
512 IV iv; 595 IV iv;
513 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 618 const_iv (SDL_USEREVENT),
536 619
537 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
540 673
541 const_iv (SDLK_FIRST), 674 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 675 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
619 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
624# undef const_iv 790# undef const_iv
625 }; 791 };
626 792
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 823 CODE:
658{ 824{
659 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
662} 833}
663 834
664char *
665SDL_GetError () 835char *SDL_GetError ()
666 836
667int 837void SDL_braino ()
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 838
670void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
671SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
672 855
673void 856void
674SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
675 PPCODE: 858 PPCODE:
676{ 859{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 874
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 877
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 879
700 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
701 while (*m) 881 while (*m)
702 { 882 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 884 {
705 AV *av = newAV (); 885 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
732 912
733 if (RETVAL) 913 if (RETVAL)
734 { 914 {
735 av_clear (texture_av); 915 av_clear (texture_av);
736 916
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 919#include "glfunc.h"
740#undef GL_FUNC 920#undef GL_FUNC
741 } 921 }
742} 922}
749char * 929char *
750SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
751 931
752int 932int
753SDL_GetAppState () 933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
754 937
755void 938void
756poll_events () 939poll_events ()
757 PPCODE: 940 PPCODE:
758{ 941{
768 { 951 {
769 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
770 case SDL_KEYUP: 953 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 959 break;
777 960
778 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 980 x = ev.motion.x;
798 y = ev.motion.y; 981 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 983 }
801 984
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 991 }
809 break; 992 break;
810 993
811 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 997
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1008 break;
826 } 1009 }
827 1010
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1012 }
830} 1013}
831 1014
832int 1015int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1017 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
1020
1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
837 1036
838void 1037void
839Mix_CloseAudio () 1038Mix_CloseAudio ()
840 1039
841int 1040int
876 } 1075 }
877 } 1076 }
878#endif 1077#endif
879} 1078}
880 1079
881void 1080int
882add_font (char *file) 1081add_font (char *file)
883 CODE: 1082 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
885 1086
886void 1087void
887load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
888 ALIAS: 1089 ALIAS:
889 load_image_file = 1 1090 load_image_file = 1
975void 1176void
976error (char *message) 1177error (char *message)
977 CODE: 1178 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1180#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1182#endif
982 1183
983void 1184void
984fatal (char *message) 1185fatal (char *message)
985 CODE: 1186 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1188#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1190#endif
990 _exit (1); 1191 _exit (1);
991 1192
992void 1193void
993_exit (int retval = 0) 1194_exit (int retval = 0)
1005#if DEBUG 1206#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
1007#endif 1208#endif
1008} 1209}
1009 1210
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1212
1012PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
1013 1214
1014CFPlus::Font 1215DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1217 CODE:
1017{ 1218{
1018 int count; 1219 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1223}
1023 OUTPUT: 1224 OUTPUT:
1024 RETVAL 1225 RETVAL
1025 1226
1026void 1227void
1027DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
1028 CODE: 1229 CODE:
1029 pango_font_description_free (self); 1230 pango_font_description_free (self);
1030 1231
1031void 1232void
1032make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1033 PROTOTYPE: $ 1234 PROTOTYPE: $
1034 CODE: 1235 CODE:
1035 default_font = self; 1236 default_font = self;
1036 1237
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1239
1039PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1040 1241
1041void 1242void
1042reset_glyph_cache () 1243glyph_cache_backup ()
1043 PROTOTYPE: 1244 PROTOTYPE:
1044 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1045 tc_clear (); 1252 tc_restore ();
1046 1253
1047CFPlus::Layout 1254DC::Layout
1048new (SV *class) 1255new (SV *class)
1049 CODE: 1256 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1051 1258
1052 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1063 OUTPUT: 1270 OUTPUT:
1064 RETVAL 1271 RETVAL
1065 1272
1066void 1273void
1067DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1068 CODE: 1275 CODE:
1069 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1070 rc_free (self->rc); 1277 rc_free (self->rc);
1071 Safefree (self); 1278 Safefree (self);
1072 1279
1073void 1280void
1074set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1075 CODE: 1282 CODE:
1076{ 1283{
1077 STRLEN textlen; 1284 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1079 1286
1080 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1081} 1288}
1082 1289
1083void 1290void
1084set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1085 CODE: 1292 CODE:
1086{ 1293{
1087 STRLEN textlen; 1294 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1089 1296
1090 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1091} 1298}
1092 1299
1093void 1300void
1094set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1095 CODE: 1302 CODE:
1096{ 1303{
1097 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1306 const char *pos = text;
1134 if (attrs) 1341 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1136} 1343}
1137 1344
1138void 1345void
1139get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1140 PPCODE: 1347 PPCODE:
1141{ 1348{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1350
1144 do 1351 do
1145 { 1352 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1354
1148 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1149 { 1356 {
1150 PangoRectangle extents; 1357 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1366
1160 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1161} 1368}
1162 1369
1163int 1370int
1164has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1165 CODE: 1372 CODE:
1166{ 1373{
1167 int lines = 1; 1374 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1169 1376
1174} 1381}
1175 OUTPUT: 1382 OUTPUT:
1176 RETVAL 1383 RETVAL
1177 1384
1178SV * 1385SV *
1179get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1180 CODE: 1387 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1390 OUTPUT:
1184 RETVAL 1391 RETVAL
1185 1392
1186void 1393void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1395 CODE:
1189 self->r = r; 1396 self->r = r;
1190 self->g = g; 1397 self->g = g;
1191 self->b = b; 1398 self->b = b;
1192 self->a = a; 1399 self->a = a;
1193 1400
1194void 1401void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1403 CODE:
1197 if (self->font != font) 1404 if (self->font != font)
1198 { 1405 {
1199 self->font = font; 1406 self->font = font;
1200 layout_update_font (self); 1407 layout_update_font (self);
1201 } 1408 }
1202 1409
1203void 1410void
1204set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1205 CODE: 1412 CODE:
1206 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1207 { 1414 {
1208 self->base_height = base_height; 1415 self->base_height = base_height;
1209 layout_update_font (self); 1416 layout_update_font (self);
1210 } 1417 }
1211 1418
1212void 1419void
1213set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1421 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1423
1217void 1424void
1218set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1219 CODE: 1426 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1428
1222void 1429void
1223set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1224 CODE: 1431 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1433
1227void 1434void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1436 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1235 ); 1442 );
1236 1443
1237void 1444void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1446 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1448
1242void 1449void
1243size (CFPlus::Layout self) 1450size (DC::Layout self)
1244 PPCODE: 1451 PPCODE:
1245{ 1452{
1246 int w, h; 1453 int w, h;
1247 1454
1248 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1253} 1460}
1254 1461
1255int 1462int
1256descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1257 CODE: 1464 CODE:
1258{ 1465{
1259 PangoRectangle rect; 1466 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1263} 1470}
1264 OUTPUT: 1471 OUTPUT:
1265 RETVAL 1472 RETVAL
1266 1473
1267int 1474int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1476 CODE:
1270{ 1477{
1271 int index, trailing; 1478 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1274} 1481}
1275 OUTPUT: 1482 OUTPUT:
1276 RETVAL 1483 RETVAL
1277 1484
1278void 1485void
1279cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1487 PPCODE:
1281{ 1488{
1282 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1491
1285 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1496}
1290 1497
1291void 1498void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1500 PPCODE:
1294{ 1501{
1295 int line, x; 1502 int line, x;
1296 1503
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1507 --line;
1508#endif
1300 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1512}
1304 1513
1305void 1514void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1516 PPCODE:
1308{ 1517{
1309 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1310 int index, trailing; 1519 int index, trailing;
1311 1520
1312 if (line < 0) 1521 if (line < 0)
1313 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1314 1523
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1317 1526
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1528
1320 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1536 }
1328} 1537}
1329 1538
1330void 1539void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1541 CODE:
1333 rc_clear (self->rc); 1542 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1335 self->pl, 1544 self->pl,
1336 self->rc, 1545 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1550 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1551 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1552 pango_layout_context_changed (self->pl);
1344 1553
1345void 1554void
1346draw (CFPlus::Layout self) 1555draw (DC::Layout self)
1347 CODE: 1556 CODE:
1348{ 1557{
1349 glEnable (GL_TEXTURE_2D); 1558 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1560 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1568 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1569 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1570 glDisable (GL_TEXTURE_2D);
1362} 1571}
1363 1572
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1574
1366PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1367 1576
1368void 1577void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1657 RETVAL = width > 0;
1449} 1658}
1450 OUTPUT: 1659 OUTPUT:
1451 RETVAL 1660 RETVAL
1452 1661
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1663
1455PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1456 1665
1457CFPlus::Map 1666DC::Map
1458new (SV *class) 1667new (SV *class)
1459 CODE: 1668 CODE:
1460 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1670 RETVAL->x = 0;
1462 RETVAL->y = 0; 1671 RETVAL->y = 0;
1470 RETVAL->row = 0; 1679 RETVAL->row = 0;
1471 OUTPUT: 1680 OUTPUT:
1472 RETVAL 1681 RETVAL
1473 1682
1474void 1683void
1475DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1476 CODE: 1685 CODE:
1477{ 1686{
1478 map_clear (self); 1687 map_clear (self);
1479 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1480 Safefree (self->tex); 1689 Safefree (self->tex);
1481 Safefree (self); 1690 Safefree (self);
1482} 1691}
1483 1692
1484void 1693void
1485resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1695 CODE:
1487 self->w = map_width; 1696 self->w = map_width;
1488 self->h = map_height; 1697 self->h = map_height;
1489 1698
1490void 1699void
1491clear (CFPlus::Map self) 1700clear (DC::Map self)
1492 CODE: 1701 CODE:
1493 map_clear (self); 1702 map_clear (self);
1494 1703
1495void 1704void
1496set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1706 CODE:
1498{ 1707{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1709 need_texid (self, tile);
1501} 1710}
1502 1711
1503void 1712void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1714 CODE:
1506{ 1715{
1507 tileid texid; 1716 tileid texid;
1508 maptex *tex; 1717 maptex *tex;
1509 1718
1522 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1524} 1733}
1525 1734
1526void 1735void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1737 CODE:
1529{ 1738{
1530 need_texid (self, texid); 1739 need_texid (self, texid);
1531 1740
1532 { 1741 {
1552 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1763}
1555 1764
1556int 1765int
1557ox (CFPlus::Map self) 1766ox (DC::Map self)
1558 ALIAS: 1767 ALIAS:
1559 oy = 1 1768 oy = 1
1560 x = 2 1769 x = 2
1561 y = 3 1770 y = 3
1562 w = 4 1771 w = 4
1573 } 1782 }
1574 OUTPUT: 1783 OUTPUT:
1575 RETVAL 1784 RETVAL
1576 1785
1577void 1786void
1578scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1579 CODE: 1788 CODE:
1580{ 1789{
1581 if (dx > 0) 1790 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1792 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1600 } 1809 }
1601} 1810}
1602 1811
1603SV * 1812SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1814 CODE:
1606{ 1815{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1818 mapcell *cell;
1637 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1638 1847
1639 do 1848 do
1640 { 1849 {
1641 ext = *data++; 1850 ext = *data++;
1642 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1643 1852
1644 if (cmd < 4) 1853 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1647 { 1856 {
1650 } 1859 }
1651 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1654 { 1863 {
1655 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 1868
1658 data += *data + 1; 1869 data += *data + 1;
1659 } 1870 }
1660 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1872 cell->flags = *data++;
1691 } 1902 }
1692 } 1903 }
1693 } 1904 }
1694 } 1905 }
1695 else 1906 else
1696 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1697 } 1908 }
1698} 1909}
1699 OUTPUT: 1910 OUTPUT:
1700 RETVAL 1911 RETVAL
1701 1912
1702SV * 1913SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1915 CODE:
1705{ 1916{
1706 int x1, x; 1917 int x1, x;
1707 int y1, y; 1918 int y1, y;
1708 int z; 1919 int z;
1753} 1964}
1754 OUTPUT: 1965 OUTPUT:
1755 RETVAL 1966 RETVAL
1756 1967
1757void 1968void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 1970 CODE:
1760{ 1971{
1761 int x, y, z; 1972 int x, y, z;
1762 1973
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 1977 smooth_key skey;
1767 1978 int pl_x, pl_y;
1979 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1980 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1981 rc_key_t key;
1770 rc_array_t *arr; 1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1771 1985
1772 // thats current max. sorry. 1986 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1775 1989
1830 tileid tile = cell->tile [z]; 2044 tileid tile = cell->tile [z];
1831 2045
1832 if (tile) 2046 if (tile)
1833 { 2047 {
1834 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1835 int px, py; 2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1836 2051
1837 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1838 { 2053 {
1839 if (!tex.name) 2054 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1841 2056
1842 key.texname = tex.name; 2057 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1844 } 2059 }
1845 2060
1846 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1848 2068
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853 2073
1854 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 2075 {
1856 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 2077 if (cell->flags & 1)
1858 { 2078 {
1859 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1998 } 2218 }
1999 2219
2000 hv_clear (smooth); 2220 hv_clear (smooth);
2001 } 2221 }
2002 2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
2003 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2004 rc_free (rc); 2241 rc_free (rc);
2005 2242
2006 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
2014 { 2251 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
2016 2253
2017 int px = x * T; 2254 int px = x * T;
2018 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
2019 2262
2020 if (cell->stat_hp) 2263 if (cell->stat_hp)
2021 { 2264 {
2022 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2034 } 2277 }
2035 } 2278 }
2036} 2279}
2037 2280
2038void 2281void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2283 CODE:
2041{ 2284{
2042 static float color[16][3] = { 2285 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2286 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2287 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2337 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2338 glDisable (GL_TEXTURE_2D);
2096} 2339}
2097 2340
2098void 2341void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2342fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2343 PPCODE:
2101{ 2344{
2102 int x, y; 2345 int x, y;
2103 int sw1 = sw + 2; 2346 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2347 int sh1 = sh + 2;
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
2113 2356
2114 mx += self->x - 1; 2357 mx += self->x - 1;
2115 my += self->y - 1; 2358 my += self->y - 1;
2116 2359
2117 memset (darkness1, 255, sw1 * sh1); 2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2118 2361
2119 for (y = 0; y < sh1; y++) 2362 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
2121 { 2364 {
2122 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2418 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2419 PUSHs (darkness3_sv);
2177} 2420}
2178 2421
2179SV * 2422SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2423get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2424 CODE:
2182{ 2425{
2183 int x, y, x1, y1; 2426 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2427 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2428 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2485 else
2243 *data++ = 0; 2486 *data++ = 0;
2244 } 2487 }
2245 } 2488 }
2246 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
2247 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
2249 RETVAL = data_sv; 2497 RETVAL = data_sv;
2250} 2498}
2251 OUTPUT: 2499 OUTPUT:
2252 RETVAL 2500 RETVAL
2253 2501
2254void 2502void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2504 PPCODE:
2257{ 2505{
2258 int x, y, z; 2506 int x, y, z;
2259 int w, h; 2507 int w, h;
2260 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2261 2519
2262 if (*data++ != 0) 2520 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2264 2522
2265 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
2280 { 2538 {
2281 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2282 2540
2283 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2284 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2285 uint8_t flags = *data++; 2548 flags = *data++;
2286 2549
2287 if (flags) 2550 if (flags)
2288 { 2551 {
2289 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2558
2296 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2297 { 2560 {
2298 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2299 2563
2300 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2301 { 2565 {
2302 tileid t = tile [z]; 2566 tileid t = tile [z];
2303 2567
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2569 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2571 need_texid (self, t);
2308 } 2572 }
2309 2573
2310 cell->tile [z] = t; 2574 cell->tile [z] = t;
2311 } 2575 }
2313 } 2577 }
2314 } 2578 }
2315 } 2579 }
2316} 2580}
2317 2581
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2582MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2583
2320CFPlus::RW 2584DC::RW
2321new (SV *class, SV *data_sv) 2585new (SV *class, SV *data_sv)
2322 CODE: 2586 CODE:
2323{ 2587{
2324 STRLEN datalen; 2588 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2589 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2591 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2592}
2329 OUTPUT: 2593 OUTPUT:
2330 RETVAL 2594 RETVAL
2331 2595
2332CFPlus::RW 2596DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2597new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2598 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2599 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2600 OUTPUT:
2337 RETVAL 2601 RETVAL
2338 2602
2339# fails on win32: 2603# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2604# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2605#void
2342#close (CFPlus::RW self) 2606#close (DC::RW self)
2343# CODE: 2607# CODE:
2344# (self->(close)) (self); 2608# (self->(close)) (self);
2345 2609
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2610MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2611
2348PROTOTYPES: DISABLE 2612PROTOTYPES: DISABLE
2349 2613
2350CFPlus::Channel 2614DC::Channel
2351find () 2615find ()
2352 CODE: 2616 CODE:
2353{ 2617{
2354 RETVAL = Mix_GroupAvailable (-1); 2618 RETVAL = Mix_GroupAvailable (-1);
2355 2619
2368} 2632}
2369 OUTPUT: 2633 OUTPUT:
2370 RETVAL 2634 RETVAL
2371 2635
2372void 2636void
2373halt (CFPlus::Channel self) 2637halt (DC::Channel self)
2374 CODE: 2638 CODE:
2375 Mix_HaltChannel (self); 2639 Mix_HaltChannel (self);
2376 2640
2377void 2641void
2378expire (CFPlus::Channel self, int ticks = -1) 2642expire (DC::Channel self, int ticks = -1)
2379 CODE: 2643 CODE:
2380 Mix_ExpireChannel (self, ticks); 2644 Mix_ExpireChannel (self, ticks);
2381 2645
2382void 2646void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2647fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2648 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2649 Mix_FadeOutChannel (self, ticks);
2386 2650
2387int 2651int
2388volume (CFPlus::Channel self, int volume) 2652volume (DC::Channel self, int volume)
2389 CODE: 2653 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2654 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2655 OUTPUT:
2392 RETVAL 2656 RETVAL
2393 2657
2394void 2658void
2395unregister_all_effects (CFPlus::Channel self) 2659unregister_all_effects (DC::Channel self)
2396 CODE: 2660 CODE:
2397 Mix_UnregisterAllEffects (self); 2661 Mix_UnregisterAllEffects (self);
2398 2662
2399void 2663void
2400set_panning (CFPlus::Channel self, int left, int right) 2664set_panning (DC::Channel self, int left, int right)
2401 CODE: 2665 CODE:
2402 left = CLAMP (left , 0, 255); 2666 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2667 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2668 Mix_SetPanning (self, left, right);
2405 2669
2406void 2670void
2407set_distance (CFPlus::Channel self, int distance) 2671set_distance (DC::Channel self, int distance)
2408 CODE: 2672 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2673 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2674
2411void 2675void
2412set_position (CFPlus::Channel self, int angle, int distance) 2676set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2677 CODE:
2414 2678
2415void 2679void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2681 CODE:
2418{ 2682{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2686}
2423 2687
2424void 2688void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2689set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2690 CODE:
2427 Mix_SetReverseStereo (self, flip); 2691 Mix_SetReverseStereo (self, flip);
2428 2692
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2694
2431PROTOTYPES: DISABLE 2695PROTOTYPES: DISABLE
2432 2696
2433CFPlus::MixChunk 2697DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2698new (SV *class, DC::RW rwops)
2435 CODE: 2699 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2700 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2701 OUTPUT:
2438 RETVAL 2702 RETVAL
2439 2703
2440void 2704void
2441DESTROY (CFPlus::MixChunk self) 2705DESTROY (DC::MixChunk self)
2442 CODE: 2706 CODE:
2443 Mix_FreeChunk (self); 2707 Mix_FreeChunk (self);
2444 2708
2445int 2709int
2446volume (CFPlus::MixChunk self, int volume = -1) 2710volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2711 CODE:
2448 if (items > 1) 2712 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2713 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2714 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2715 OUTPUT:
2452 RETVAL 2716 RETVAL
2453 2717
2454CFPlus::Channel 2718DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2719play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2720 CODE:
2457{ 2721{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2722 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2723
2460 if (RETVAL < 0) 2724 if (RETVAL < 0)
2467 } 2731 }
2468} 2732}
2469 OUTPUT: 2733 OUTPUT:
2470 RETVAL 2734 RETVAL
2471 2735
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2737
2474int 2738int
2475volume (int volume = -1) 2739volume (int volume = -1)
2476 PROTOTYPE: ;$ 2740 PROTOTYPE: ;$
2477 CODE: 2741 CODE:
2489void 2753void
2490halt () 2754halt ()
2491 CODE: 2755 CODE:
2492 Mix_HaltMusic (); 2756 Mix_HaltMusic ();
2493 2757
2494CFPlus::MixMusic 2758DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2759new (SV *class, DC::RW rwops)
2496 CODE: 2760 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2761 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2762 OUTPUT:
2499 RETVAL 2763 RETVAL
2500 2764
2501void 2765void
2502DESTROY (CFPlus::MixMusic self) 2766DESTROY (DC::MixMusic self)
2503 CODE: 2767 CODE:
2504 Mix_FreeMusic (self); 2768 Mix_FreeMusic (self);
2505 2769
2506int 2770int
2507play (CFPlus::MixMusic self, int loops = -1) 2771play (DC::MixMusic self, int loops = -1)
2508 CODE: 2772 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2773 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2774 OUTPUT:
2511 RETVAL 2775 RETVAL
2512 2776
2513void 2777void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2778fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2779 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2780 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2781
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2782MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2783
2520PROTOTYPES: ENABLE 2784PROTOTYPES: ENABLE
2521 2785
2522BOOT: 2786BOOT:
2523{ 2787{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2788 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2789 static const struct {
2526 const char *name; 2790 const char *name;
2527 IV iv; 2791 IV iv;
2528 } *civ, const_iv[] = { 2792 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2793# define const_iv(name) { # name, (IV)name }
2743void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2744 CODE: 3008 CODE:
2745 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2746 3010
2747void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
3012 PROTOTYPE: @
2748 ALIAS: 3013 ALIAS:
2749 glColor_premultiply = 1 3014 glColor_premultiply = 1
2750 CODE: 3015 CODE:
2751 if (ix) 3016 if (ix)
2752 { 3017 {
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3087void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3088 CODE:
2824 if (gl.SeparableFilter2D) 3089 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3090 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3091
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3092void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3093
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3094void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3095
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3096void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3097
2858 3123
2859void glEndList () 3124void glEndList ()
2860 3125
2861void glCallList (int list) 3126void glCallList (int list)
2862 3127
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3129
2865PROTOTYPES: DISABLE 3130PROTOTYPES: DISABLE
2866 3131
2867void 3132void
2868find_widget (SV *self, NV x, NV y) 3133find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3137 XPUSHs (self);
2873} 3138}
2874 3139
2875BOOT: 3140BOOT:
2876{ 3141{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3142 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3143
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3144 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3145 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3146 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3147 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3148}
2884 3149
2885void 3150void
2886draw (SV *self) 3151draw (SV *self)
2887 CODE: 3152 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3159 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3160 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3161 double draw_x, draw_y;
2897 3162
2898 if (!SvROK (self)) 3163 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3164 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3165
2901 hv = (HV *)SvRV (self); 3166 hv = (HV *)SvRV (self);
2902 3167
2903 if (SvTYPE (hv) != SVt_PVHV) 3168 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3169 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3170
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3171 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3172 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3173
2909 if (!h || !w) 3174 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines