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.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.281 by root, Thu Dec 4 23:58:20 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 16
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);
209 int w, h; 233 int w, h;
210 float s, t; 234 float s, t;
211 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
212 tileid smoothtile; 236 tileid smoothtile;
213 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
214} maptex; 239} maptex;
215 240
216typedef struct { 241typedef struct {
217 uint32_t player; 242 uint32_t player;
218 tileid tile[3]; 243 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 256 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 257 int texs; maptex *tex; // [tileid]
233 258
234 int32_t rows; 259 int32_t rows;
235 maprow *row; 260 maprow *row;
236} *CFPlus__Map; 261} *DC__Map;
237 262
238static char * 263static char *
239prepend (char *ptr, int sze, int inc) 264prepend (char *ptr, int sze, int inc)
240{ 265{
241 char *p; 266 char *p;
279 self->texs *= 2; 304 self->texs *= 2;
280 } 305 }
281} 306}
282 307
283static maprow * 308static maprow *
284map_get_row (CFPlus__Map self, int y) 309map_get_row (DC__Map self, int y)
285{ 310{
286 if (0 > y) 311 if (0 > y)
287 { 312 {
288 int extend = - y + MAP_EXTEND_Y; 313 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 314 Prepend (maprow, self->row, self->rows, extend);
327 352
328 return row->col + (x - row->c0); 353 return row->col + (x - row->c0);
329} 354}
330 355
331static mapcell * 356static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 357map_get_cell (DC__Map self, int x, int y)
333{ 358{
334 return row_get_cell (map_get_row (self, y), x); 359 return row_get_cell (map_get_row (self, y), x);
335} 360}
336 361
337static void 362static void
338map_clear (CFPlus__Map self) 363map_clear (DC__Map self)
339{ 364{
340 int r; 365 int r;
341 366
342 for (r = 0; r < self->rows; r++) 367 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 368 Safefree (self->row[r].col);
350 self->oy = 0; 375 self->oy = 0;
351 self->row = 0; 376 self->row = 0;
352 self->rows = 0; 377 self->rows = 0;
353} 378}
354 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
355static void 390static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 392{
358 int x, y; 393 int x, y;
359 maprow *row; 394 maprow *row;
360 mapcell *cell; 395 mapcell *cell;
361 396
373 if (x >= row->c1) 408 if (x >= row->c1)
374 break; 409 break;
375 410
376 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
377 412
378 cell->darkness = 0; 413 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 414 }
383 } 415 }
384} 416}
385 417
386typedef struct { 418typedef struct {
498 return 0; 530 return 0;
499 531
500 return 1; 532 return 1;
501} 533}
502 534
503MODULE = CFPlus PACKAGE = CFPlus 535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
586
587MODULE = Deliantra::Client PACKAGE = DC
504 588
505PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
506 590
507BOOT: 591BOOT:
508{ 592{
509 HV *stash = gv_stashpv ("CFPlus", 1); 593 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 594 static const struct {
511 const char *name; 595 const char *name;
512 IV iv; 596 IV iv;
513 } *civ, const_iv[] = { 597 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 598# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 619 const_iv (SDL_USEREVENT),
536 620
537 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
540 674
541 const_iv (SDLK_FIRST), 675 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 676 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
624 758
759 const_iv (KMOD_LRAM),
760
625 const_iv (MIX_DEFAULT_FORMAT), 761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
626# undef const_iv 791# undef const_iv
627 }; 792 };
628 793
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 824 CODE:
660{ 825{
661 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 827 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); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
833#endif
664} 834}
665 835
666char *
667SDL_GetError () 836char *SDL_GetError ()
668 837
669int 838void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 839
672void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
673SDL_Quit () 846void SDL_Quit ()
847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
674 856
675void 857void
676SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
677 PPCODE: 859 PPCODE:
678{ 860{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 875
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 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); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 878
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 880
702 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
703 while (*m) 882 while (*m)
704 { 883 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 885 {
707 AV *av = newAV (); 886 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
753 932
754int 933int
755SDL_GetAppState () 934SDL_GetAppState ()
756 935
936int
937SDL_GetModState ()
938
757void 939void
758poll_events () 940poll_events ()
759 PPCODE: 941 PPCODE:
760{ 942{
761 SDL_Event ev; 943 SDL_Event ev;
770 { 952 {
771 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
772 case SDL_KEYUP: 954 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 957 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 958 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 960 break;
779 961
780 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 981 x = ev.motion.x;
800 y = ev.motion.y; 982 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 984 }
803 985
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 992 }
811 break; 993 break;
812 994
813 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 998
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1007 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1008 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1009 break;
828 } 1010 }
829 1011
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1013 }
832} 1014}
833 1015
834int 1016int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1076 }
895 } 1077 }
896#endif 1078#endif
897} 1079}
898 1080
899void 1081int
900add_font (char *file) 1082add_font (char *file)
901 CODE: 1083 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
903 1087
904void 1088void
905load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
906 ALIAS: 1090 ALIAS:
907 load_image_file = 1 1091 load_image_file = 1
993void 1177void
994error (char *message) 1178error (char *message)
995 CODE: 1179 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1181#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1183#endif
1000 1184
1001void 1185void
1002fatal (char *message) 1186fatal (char *message)
1003 CODE: 1187 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1189#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1191#endif
1008 _exit (1); 1192 _exit (1);
1009 1193
1010void 1194void
1011_exit (int retval = 0) 1195_exit (int retval = 0)
1023#if DEBUG 1207#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1025#endif 1209#endif
1026} 1210}
1027 1211
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1219MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1220
1030PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1031 1222
1032CFPlus::Font 1223DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1225 CODE:
1035{ 1226{
1036 int count; 1227 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1231}
1041 OUTPUT: 1232 OUTPUT:
1042 RETVAL 1233 RETVAL
1043 1234
1044void 1235void
1045DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
1046 CODE: 1237 CODE:
1047 pango_font_description_free (self); 1238 pango_font_description_free (self);
1048 1239
1049void 1240void
1050make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1051 PROTOTYPE: $ 1242 PROTOTYPE: $
1052 CODE: 1243 CODE:
1053 default_font = self; 1244 default_font = self;
1054 1245
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1247
1057PROTOTYPES: DISABLE 1248PROTOTYPES: DISABLE
1058 1249
1059void 1250void
1060reset_glyph_cache () 1251glyph_cache_backup ()
1061 PROTOTYPE: 1252 PROTOTYPE:
1062 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
1063 tc_clear (); 1260 tc_restore ();
1064 1261
1065CFPlus::Layout 1262DC::Layout
1066new (SV *class) 1263new (SV *class)
1067 CODE: 1264 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
1069 1266
1070 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
1081 OUTPUT: 1278 OUTPUT:
1082 RETVAL 1279 RETVAL
1083 1280
1084void 1281void
1085DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
1086 CODE: 1283 CODE:
1087 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1088 rc_free (self->rc); 1285 rc_free (self->rc);
1089 Safefree (self); 1286 Safefree (self);
1090 1287
1091void 1288void
1092set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
1093 CODE: 1290 CODE:
1094{ 1291{
1095 STRLEN textlen; 1292 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1097 1294
1098 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
1099} 1296}
1100 1297
1101void 1298void
1102set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
1103 CODE: 1300 CODE:
1104{ 1301{
1105 STRLEN textlen; 1302 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1107 1304
1108 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
1109} 1306}
1110 1307
1111void 1308void
1112set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
1113 CODE: 1310 CODE:
1114{ 1311{
1115 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1314 const char *pos = text;
1152 if (attrs) 1349 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
1154} 1351}
1155 1352
1156void 1353void
1157get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
1158 PPCODE: 1355 PPCODE:
1159{ 1356{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1358
1162 do 1359 do
1163 { 1360 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1362
1166 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1167 { 1364 {
1168 PangoRectangle extents; 1365 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1374
1178 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1179} 1376}
1180 1377
1181int 1378int
1182has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1183 CODE: 1380 CODE:
1184{ 1381{
1185 int lines = 1; 1382 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1187 1384
1192} 1389}
1193 OUTPUT: 1390 OUTPUT:
1194 RETVAL 1391 RETVAL
1195 1392
1196SV * 1393SV *
1197get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1198 CODE: 1395 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1398 OUTPUT:
1202 RETVAL 1399 RETVAL
1203 1400
1204void 1401void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1402set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1403 CODE:
1207 self->r = r; 1404 self->r = r;
1208 self->g = g; 1405 self->g = g;
1209 self->b = b; 1406 self->b = b;
1210 self->a = a; 1407 self->a = a;
1211 1408
1212void 1409void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1411 CODE:
1215 if (self->font != font) 1412 if (self->font != font)
1216 { 1413 {
1217 self->font = font; 1414 self->font = font;
1218 layout_update_font (self); 1415 layout_update_font (self);
1219 } 1416 }
1220 1417
1221void 1418void
1222set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1223 CODE: 1420 CODE:
1224 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1225 { 1422 {
1226 self->base_height = base_height; 1423 self->base_height = base_height;
1227 layout_update_font (self); 1424 layout_update_font (self);
1228 } 1425 }
1229 1426
1230void 1427void
1231set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1429 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1430 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1431
1235void 1432void
1236set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1237 CODE: 1434 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1436
1240void 1437void
1241set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1242 CODE: 1439 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1441
1245void 1442void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1444 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1253 ); 1450 );
1254 1451
1255void 1452void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1454 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1456
1260void 1457void
1261size (CFPlus::Layout self) 1458size (DC::Layout self)
1262 PPCODE: 1459 PPCODE:
1263{ 1460{
1264 int w, h; 1461 int w, h;
1265 1462
1266 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1271} 1468}
1272 1469
1273int 1470int
1274descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1275 CODE: 1472 CODE:
1276{ 1473{
1277 PangoRectangle rect; 1474 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1281} 1478}
1282 OUTPUT: 1479 OUTPUT:
1283 RETVAL 1480 RETVAL
1284 1481
1285int 1482int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1484 CODE:
1288{ 1485{
1289 int index, trailing; 1486 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1487 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1292} 1489}
1293 OUTPUT: 1490 OUTPUT:
1294 RETVAL 1491 RETVAL
1295 1492
1296void 1493void
1297cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1495 PPCODE:
1299{ 1496{
1300 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1499
1303 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1504}
1308 1505
1309void 1506void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1508 PPCODE:
1312{ 1509{
1313 int line, x; 1510 int line, x;
1314 1511
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1512 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1513#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1515 --line;
1516#endif
1318 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1520}
1322 1521
1323void 1522void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1524 PPCODE:
1326{ 1525{
1327 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1328 int index, trailing; 1527 int index, trailing;
1329 1528
1330 if (line < 0) 1529 if (line < 0)
1331 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1332 1531
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1335 1534
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1535 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1536
1338 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1544 }
1346} 1545}
1347 1546
1348void 1547void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1549 CODE:
1351 rc_clear (self->rc); 1550 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1353 self->pl, 1552 self->pl,
1354 self->rc, 1553 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1558 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1559 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1560 pango_layout_context_changed (self->pl);
1362 1561
1363void 1562void
1364draw (CFPlus::Layout self) 1563draw (DC::Layout self)
1365 CODE: 1564 CODE:
1366{ 1565{
1367 glEnable (GL_TEXTURE_2D); 1566 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1567 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1568 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1576 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1577 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1578 glDisable (GL_TEXTURE_2D);
1380} 1579}
1381 1580
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1581MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1582
1384PROTOTYPES: ENABLE 1583PROTOTYPES: ENABLE
1385 1584
1386void 1585void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1586pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1665 RETVAL = width > 0;
1467} 1666}
1468 OUTPUT: 1667 OUTPUT:
1469 RETVAL 1668 RETVAL
1470 1669
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1671
1473PROTOTYPES: DISABLE 1672PROTOTYPES: DISABLE
1474 1673
1475CFPlus::Map 1674DC::Map
1476new (SV *class) 1675new (SV *class)
1477 CODE: 1676 CODE:
1478 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1678 RETVAL->x = 0;
1480 RETVAL->y = 0; 1679 RETVAL->y = 0;
1488 RETVAL->row = 0; 1687 RETVAL->row = 0;
1489 OUTPUT: 1688 OUTPUT:
1490 RETVAL 1689 RETVAL
1491 1690
1492void 1691void
1493DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1494 CODE: 1693 CODE:
1495{ 1694{
1496 map_clear (self); 1695 map_clear (self);
1497 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1498 Safefree (self->tex); 1697 Safefree (self->tex);
1499 Safefree (self); 1698 Safefree (self);
1500} 1699}
1501 1700
1502void 1701void
1503resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1703 CODE:
1505 self->w = map_width; 1704 self->w = map_width;
1506 self->h = map_height; 1705 self->h = map_height;
1507 1706
1508void 1707void
1509clear (CFPlus::Map self) 1708clear (DC::Map self)
1510 CODE: 1709 CODE:
1511 map_clear (self); 1710 map_clear (self);
1512 1711
1513void 1712void
1514set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1714 CODE:
1516{ 1715{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1717 need_texid (self, tile);
1519} 1718}
1520 1719
1521void 1720void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1722 CODE:
1524{ 1723{
1525 tileid texid; 1724 tileid texid;
1526 maptex *tex; 1725 maptex *tex;
1527 1726
1540 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1542} 1741}
1543 1742
1544void 1743void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1744set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1745 CODE:
1547{ 1746{
1548 need_texid (self, texid); 1747 need_texid (self, texid);
1549 1748
1550 { 1749 {
1569 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1771}
1573 1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0,
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1792
1574int 1793int
1575ox (CFPlus::Map self) 1794ox (DC::Map self)
1576 ALIAS: 1795 ALIAS:
1577 oy = 1 1796 oy = 1
1578 x = 2 1797 x = 2
1579 y = 3 1798 y = 3
1580 w = 4 1799 w = 4
1591 } 1810 }
1592 OUTPUT: 1811 OUTPUT:
1593 RETVAL 1812 RETVAL
1594 1813
1595void 1814void
1596scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1597 CODE: 1816 CODE:
1598{ 1817{
1599 if (dx > 0) 1818 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1820 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1618 } 1837 }
1619} 1838}
1620 1839
1621SV * 1840SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1842 CODE:
1624{ 1843{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1846 mapcell *cell;
1655 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1656 1875
1657 do 1876 do
1658 { 1877 {
1659 ext = *data++; 1878 ext = *data++;
1660 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1661 1880
1662 if (cmd < 4) 1881 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1665 { 1884 {
1668 } 1887 }
1669 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1672 { 1891 {
1673 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1896
1676 data += *data + 1; 1897 data += *data + 1;
1677 } 1898 }
1678 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1900 cell->flags = *data++;
1696 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1697 1918
1698 if (cell->tile [z]) 1919 if (cell->tile [z])
1699 { 1920 {
1700 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1701 if (!tex->name) 1923 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1703 1925
1704 if (tex->smoothtile) 1926 if (tex->smoothtile)
1705 { 1927 {
1706 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1707 if (!smooth->name) 1930 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1709 } 1932 }
1710 } 1933 }
1711 } 1934 }
1712 } 1935 }
1713 else 1936 else
1714 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1715 } 1938 }
1716} 1939}
1717 OUTPUT: 1940 OUTPUT:
1718 RETVAL 1941 RETVAL
1719 1942
1720SV * 1943SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1945 CODE:
1723{ 1946{
1724 int x1, x; 1947 int x1, x;
1725 int y1, y; 1948 int y1, y;
1726 int z; 1949 int z;
1771} 1994}
1772 OUTPUT: 1995 OUTPUT:
1773 RETVAL 1996 RETVAL
1774 1997
1775void 1998void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 2000 CODE:
1778{ 2001{
1779 int x, y, z; 2002 int x, y, z;
1780 2003
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 2007 smooth_key skey;
1785 2008 int pl_x, pl_y;
2009 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2010 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 2011 rc_key_t key;
1788 rc_array_t *arr; 2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1789 2015
1790 // thats current max. sorry. 2016 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1793 2019
1848 tileid tile = cell->tile [z]; 2074 tileid tile = cell->tile [z];
1849 2075
1850 if (tile) 2076 if (tile)
1851 { 2077 {
1852 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1853 int px, py; 2079 int px = (x + 1) * T - tex.w;
2080 int py = (y + 1) * T - tex.h;
1854 2081
1855 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
1856 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1857 if (!tex.name) 2086 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1859 2088
1860 key.texname = tex.name; 2089 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
1862 } 2091 }
1863 2092
1864 px = (x + 1) * T - tex.w; 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
1866 2100
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 2105
1872 if (cell->flags && z == 2) 2106 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 2107 {
1874 // overlays such as the speech bubble, probably more to come 2108 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 2109 if (cell->flags & 1)
1876 { 2110 {
1877 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
1978 { 2212 {
1979 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
1980 // save gobs of state changes. 2214 // save gobs of state changes.
1981 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
1982 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
1983 glEnd (); 2219 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
1986 } 2222 }
1987 2223
2016 } 2252 }
2017 2253
2018 hv_clear (smooth); 2254 hv_clear (smooth);
2019 } 2255 }
2020 2256
2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
2262
2263 key.texname = tex.name;
2264 arr = rc_array (rc, &key);
2265
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270
2271 rc_draw (rc);
2272 }
2273
2021 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2022 rc_free (rc); 2275 rc_free (rc);
2023 2276
2024 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
2032 { 2285 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2034 2287
2035 int px = x * T; 2288 int px = x * T;
2036 int py = y * T; 2289 int py = y * T;
2290
2291 if (expect_false (cell->player == player))
2292 {
2293 px += sdx;
2294 py += sdy;
2295 }
2037 2296
2038 if (cell->stat_hp) 2297 if (cell->stat_hp)
2039 { 2298 {
2040 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2052 } 2311 }
2053 } 2312 }
2054} 2313}
2055 2314
2056void 2315void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2317 CODE:
2059{ 2318{
2060 static float color[16][3] = { 2319 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2320 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2321 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2371 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2372 glDisable (GL_TEXTURE_2D);
2114} 2373}
2115 2374
2116void 2375void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2376fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2377 PPCODE:
2119{ 2378{
2120 int x, y; 2379 int x, y;
2121 int sw1 = sw + 2; 2380 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2381 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2390
2132 mx += self->x - 1; 2391 mx += self->x - 1;
2133 my += self->y - 1; 2392 my += self->y - 1;
2134 2393
2135 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2395
2137 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2139 { 2398 {
2140 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2452 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2453 PUSHs (darkness3_sv);
2195} 2454}
2196 2455
2197SV * 2456SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2457get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2458 CODE:
2200{ 2459{
2201 int x, y, x1, y1; 2460 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2461 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2462 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2519 else
2261 *data++ = 0; 2520 *data++ = 0;
2262 } 2521 }
2263 } 2522 }
2264 2523
2524 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 {
2265 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2267 RETVAL = data_sv; 2531 RETVAL = data_sv;
2268} 2532}
2269 OUTPUT: 2533 OUTPUT:
2270 RETVAL 2534 RETVAL
2271 2535
2272void 2536void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2538 PPCODE:
2275{ 2539{
2276 int x, y, z; 2540 int x, y, z;
2277 int w, h; 2541 int w, h;
2278 int x1, y1; 2542 int x1, y1;
2543 STRLEN len;
2544 uint8_t *data, *end;
2545
2546 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv);
2549 end = data + len + 8;
2550
2551 if (len < 5)
2552 XSRETURN_EMPTY;
2279 2553
2280 if (*data++ != 0) 2554 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2282 2556
2283 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
2298 { 2572 {
2299 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2300 2574
2301 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2302 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2303 uint8_t flags = *data++; 2582 flags = *data++;
2304 2583
2305 if (flags) 2584 if (flags)
2306 { 2585 {
2307 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2592
2314 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2315 { 2594 {
2316 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2317 2597
2318 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2319 { 2599 {
2320 tileid t = tile [z]; 2600 tileid t = tile [z];
2321 2601
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2603 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2605 need_texid (self, t);
2326 } 2606 }
2327 2607
2328 cell->tile [z] = t; 2608 cell->tile [z] = t;
2329 } 2609 }
2331 } 2611 }
2332 } 2612 }
2333 } 2613 }
2334} 2614}
2335 2615
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2616MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2617
2338CFPlus::RW 2618DC::RW
2339new (SV *class, SV *data_sv) 2619new (SV *class, SV *data_sv)
2340 CODE: 2620 CODE:
2341{ 2621{
2342 STRLEN datalen; 2622 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2623 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2625 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2626}
2347 OUTPUT: 2627 OUTPUT:
2348 RETVAL 2628 RETVAL
2349 2629
2350CFPlus::RW 2630DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2631new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2632 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2633 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2634 OUTPUT:
2355 RETVAL 2635 RETVAL
2356 2636
2357# fails on win32: 2637# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2638# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2639#void
2360#close (CFPlus::RW self) 2640#close (DC::RW self)
2361# CODE: 2641# CODE:
2362# (self->(close)) (self); 2642# (self->(close)) (self);
2363 2643
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2644MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2645
2366PROTOTYPES: DISABLE 2646PROTOTYPES: DISABLE
2367 2647
2368CFPlus::Channel 2648DC::Channel
2369find () 2649find ()
2370 CODE: 2650 CODE:
2371{ 2651{
2372 RETVAL = Mix_GroupAvailable (-1); 2652 RETVAL = Mix_GroupAvailable (-1);
2373 2653
2386} 2666}
2387 OUTPUT: 2667 OUTPUT:
2388 RETVAL 2668 RETVAL
2389 2669
2390void 2670void
2391halt (CFPlus::Channel self) 2671halt (DC::Channel self)
2392 CODE: 2672 CODE:
2393 Mix_HaltChannel (self); 2673 Mix_HaltChannel (self);
2394 2674
2395void 2675void
2396expire (CFPlus::Channel self, int ticks = -1) 2676expire (DC::Channel self, int ticks = -1)
2397 CODE: 2677 CODE:
2398 Mix_ExpireChannel (self, ticks); 2678 Mix_ExpireChannel (self, ticks);
2399 2679
2400void 2680void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2681fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2682 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2683 Mix_FadeOutChannel (self, ticks);
2404 2684
2405int 2685int
2406volume (CFPlus::Channel self, int volume) 2686volume (DC::Channel self, int volume)
2407 CODE: 2687 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2688 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2689 OUTPUT:
2410 RETVAL 2690 RETVAL
2411 2691
2412void 2692void
2413unregister_all_effects (CFPlus::Channel self) 2693unregister_all_effects (DC::Channel self)
2414 CODE: 2694 CODE:
2415 Mix_UnregisterAllEffects (self); 2695 Mix_UnregisterAllEffects (self);
2416 2696
2417void 2697void
2418set_panning (CFPlus::Channel self, int left, int right) 2698set_panning (DC::Channel self, int left, int right)
2419 CODE: 2699 CODE:
2420 left = CLAMP (left , 0, 255); 2700 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2701 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2702 Mix_SetPanning (self, left, right);
2423 2703
2424void 2704void
2425set_distance (CFPlus::Channel self, int distance) 2705set_distance (DC::Channel self, int distance)
2426 CODE: 2706 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2707 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2708
2429void 2709void
2430set_position (CFPlus::Channel self, int angle, int distance) 2710set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2711 CODE:
2432 2712
2433void 2713void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2715 CODE:
2436{ 2716{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2720}
2441 2721
2442void 2722void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2723set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2724 CODE:
2445 Mix_SetReverseStereo (self, flip); 2725 Mix_SetReverseStereo (self, flip);
2446 2726
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2728
2449PROTOTYPES: DISABLE 2729PROTOTYPES: DISABLE
2450 2730
2451CFPlus::MixChunk 2731DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2732new (SV *class, DC::RW rwops)
2453 CODE: 2733 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2734 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2735 OUTPUT:
2456 RETVAL 2736 RETVAL
2457 2737
2458void 2738void
2459DESTROY (CFPlus::MixChunk self) 2739DESTROY (DC::MixChunk self)
2460 CODE: 2740 CODE:
2461 Mix_FreeChunk (self); 2741 Mix_FreeChunk (self);
2462 2742
2463int 2743int
2464volume (CFPlus::MixChunk self, int volume = -1) 2744volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2745 CODE:
2466 if (items > 1) 2746 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2747 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2748 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2749 OUTPUT:
2470 RETVAL 2750 RETVAL
2471 2751
2472CFPlus::Channel 2752DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2753play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2754 CODE:
2475{ 2755{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2756 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2757
2478 if (RETVAL < 0) 2758 if (RETVAL < 0)
2485 } 2765 }
2486} 2766}
2487 OUTPUT: 2767 OUTPUT:
2488 RETVAL 2768 RETVAL
2489 2769
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2771
2492int 2772int
2493volume (int volume = -1) 2773volume (int volume = -1)
2494 PROTOTYPE: ;$ 2774 PROTOTYPE: ;$
2495 CODE: 2775 CODE:
2507void 2787void
2508halt () 2788halt ()
2509 CODE: 2789 CODE:
2510 Mix_HaltMusic (); 2790 Mix_HaltMusic ();
2511 2791
2512CFPlus::MixMusic 2792DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2793new (SV *class, DC::RW rwops)
2514 CODE: 2794 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2795 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2796 OUTPUT:
2517 RETVAL 2797 RETVAL
2518 2798
2519void 2799void
2520DESTROY (CFPlus::MixMusic self) 2800DESTROY (DC::MixMusic self)
2521 CODE: 2801 CODE:
2522 Mix_FreeMusic (self); 2802 Mix_FreeMusic (self);
2523 2803
2524int 2804int
2525play (CFPlus::MixMusic self, int loops = -1) 2805play (DC::MixMusic self, int loops = -1)
2526 CODE: 2806 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2807 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2808 OUTPUT:
2529 RETVAL 2809 RETVAL
2530 2810
2531void 2811void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2812fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2813 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2814 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2815
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2816MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2817
2538PROTOTYPES: ENABLE 2818PROTOTYPES: ENABLE
2539 2819
2540BOOT: 2820BOOT:
2541{ 2821{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2822 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2823 static const struct {
2544 const char *name; 2824 const char *name;
2545 IV iv; 2825 IV iv;
2546 } *civ, const_iv[] = { 2826 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2827# define const_iv(name) { # name, (IV)name }
2761void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2762 CODE: 3042 CODE:
2763 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2764 3044
2765void glColor (float r, float g, float b, float a = 1.0) 3045void glColor (float r, float g, float b, float a = 1.0)
3046 PROTOTYPE: @
2766 ALIAS: 3047 ALIAS:
2767 glColor_premultiply = 1 3048 glColor_premultiply = 1
2768 CODE: 3049 CODE:
2769 if (ix) 3050 if (ix)
2770 { 3051 {
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3121void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3122 CODE:
2842 if (gl.SeparableFilter2D) 3123 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3124 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3125
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3126void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3127
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3128void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3129
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3130void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3131
2876 3157
2877void glEndList () 3158void glEndList ()
2878 3159
2879void glCallList (int list) 3160void glCallList (int list)
2880 3161
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3163
2883PROTOTYPES: DISABLE 3164PROTOTYPES: DISABLE
2884 3165
2885void 3166void
2886find_widget (SV *self, NV x, NV y) 3167find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3171 XPUSHs (self);
2891} 3172}
2892 3173
2893BOOT: 3174BOOT:
2894{ 3175{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3176 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3177
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3178 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3179 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3180 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3181 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3182}
2902 3183
2903void 3184void
2904draw (SV *self) 3185draw (SV *self)
2905 CODE: 3186 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3193 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3194 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3195 double draw_x, draw_y;
2915 3196
2916 if (!SvROK (self)) 3197 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3198 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3199
2919 hv = (HV *)SvRV (self); 3200 hv = (HV *)SvRV (self);
2920 3201
2921 if (SvTYPE (hv) != SVt_PVHV) 3202 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3203 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3204
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3205 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3206 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3207
2927 if (!h || !w) 3208 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines