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.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.277 by root, Mon Sep 1 06:18:09 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),
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),
624 757
758 const_iv (KMOD_LRAM),
759
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 790# undef const_iv
627 }; 791 };
628 792
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 823 CODE:
660{ 824{
661 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 833}
665 834
666char *
667SDL_GetError () 835char *SDL_GetError ()
668 836
669int 837void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 838
672void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
673SDL_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
674 855
675void 856void
676SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
677 PPCODE: 858 PPCODE:
678{ 859{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 874
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 877
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 879
702 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
703 while (*m) 881 while (*m)
704 { 882 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 884 {
707 AV *av = newAV (); 885 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
753 931
754int 932int
755SDL_GetAppState () 933SDL_GetAppState ()
756 934
935int
936SDL_GetModState ()
937
757void 938void
758poll_events () 939poll_events ()
759 PPCODE: 940 PPCODE:
760{ 941{
761 SDL_Event ev; 942 SDL_Event ev;
770 { 951 {
771 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
772 case SDL_KEYUP: 953 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 959 break;
779 960
780 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 980 x = ev.motion.x;
800 y = ev.motion.y; 981 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 983 }
803 984
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 991 }
811 break; 992 break;
812 993
813 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 997
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1008 break;
828 } 1009 }
829 1010
830 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))));
831 } 1012 }
832} 1013}
833 1014
834int 1015int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1075 }
895 } 1076 }
896#endif 1077#endif
897} 1078}
898 1079
899void 1080int
900add_font (char *file) 1081add_font (char *file)
901 CODE: 1082 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
903 1086
904void 1087void
905load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
906 ALIAS: 1089 ALIAS:
907 load_image_file = 1 1090 load_image_file = 1
993void 1176void
994error (char *message) 1177error (char *message)
995 CODE: 1178 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1180#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1182#endif
1000 1183
1001void 1184void
1002fatal (char *message) 1185fatal (char *message)
1003 CODE: 1186 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1188#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1190#endif
1008 _exit (1); 1191 _exit (1);
1009 1192
1010void 1193void
1011_exit (int retval = 0) 1194_exit (int retval = 0)
1023#if DEBUG 1206#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
1025#endif 1208#endif
1026} 1209}
1027 1210
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1212
1030PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
1031 1214
1032CFPlus::Font 1215DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1217 CODE:
1035{ 1218{
1036 int count; 1219 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1223}
1041 OUTPUT: 1224 OUTPUT:
1042 RETVAL 1225 RETVAL
1043 1226
1044void 1227void
1045DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
1046 CODE: 1229 CODE:
1047 pango_font_description_free (self); 1230 pango_font_description_free (self);
1048 1231
1049void 1232void
1050make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1051 PROTOTYPE: $ 1234 PROTOTYPE: $
1052 CODE: 1235 CODE:
1053 default_font = self; 1236 default_font = self;
1054 1237
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1239
1057PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1058 1241
1059void 1242void
1060reset_glyph_cache () 1243glyph_cache_backup ()
1061 PROTOTYPE: 1244 PROTOTYPE:
1062 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1063 tc_clear (); 1252 tc_restore ();
1064 1253
1065CFPlus::Layout 1254DC::Layout
1066new (SV *class) 1255new (SV *class)
1067 CODE: 1256 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1069 1258
1070 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1081 OUTPUT: 1270 OUTPUT:
1082 RETVAL 1271 RETVAL
1083 1272
1084void 1273void
1085DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1086 CODE: 1275 CODE:
1087 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1088 rc_free (self->rc); 1277 rc_free (self->rc);
1089 Safefree (self); 1278 Safefree (self);
1090 1279
1091void 1280void
1092set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1093 CODE: 1282 CODE:
1094{ 1283{
1095 STRLEN textlen; 1284 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1097 1286
1098 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1099} 1288}
1100 1289
1101void 1290void
1102set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1103 CODE: 1292 CODE:
1104{ 1293{
1105 STRLEN textlen; 1294 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1107 1296
1108 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1109} 1298}
1110 1299
1111void 1300void
1112set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1113 CODE: 1302 CODE:
1114{ 1303{
1115 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1306 const char *pos = text;
1152 if (attrs) 1341 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1154} 1343}
1155 1344
1156void 1345void
1157get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1158 PPCODE: 1347 PPCODE:
1159{ 1348{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1350
1162 do 1351 do
1163 { 1352 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1354
1166 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1167 { 1356 {
1168 PangoRectangle extents; 1357 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1366
1178 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1179} 1368}
1180 1369
1181int 1370int
1182has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1183 CODE: 1372 CODE:
1184{ 1373{
1185 int lines = 1; 1374 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1187 1376
1192} 1381}
1193 OUTPUT: 1382 OUTPUT:
1194 RETVAL 1383 RETVAL
1195 1384
1196SV * 1385SV *
1197get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1198 CODE: 1387 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1390 OUTPUT:
1202 RETVAL 1391 RETVAL
1203 1392
1204void 1393void
1205set_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.)
1206 CODE: 1395 CODE:
1207 self->r = r; 1396 self->r = r;
1208 self->g = g; 1397 self->g = g;
1209 self->b = b; 1398 self->b = b;
1210 self->a = a; 1399 self->a = a;
1211 1400
1212void 1401void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1403 CODE:
1215 if (self->font != font) 1404 if (self->font != font)
1216 { 1405 {
1217 self->font = font; 1406 self->font = font;
1218 layout_update_font (self); 1407 layout_update_font (self);
1219 } 1408 }
1220 1409
1221void 1410void
1222set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1223 CODE: 1412 CODE:
1224 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1225 { 1414 {
1226 self->base_height = base_height; 1415 self->base_height = base_height;
1227 layout_update_font (self); 1416 layout_update_font (self);
1228 } 1417 }
1229 1418
1230void 1419void
1231set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1421 CODE:
1233 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);
1234 1423
1235void 1424void
1236set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1237 CODE: 1426 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1428
1240void 1429void
1241set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1242 CODE: 1431 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1433
1245void 1434void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1436 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1253 ); 1442 );
1254 1443
1255void 1444void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1446 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1448
1260void 1449void
1261size (CFPlus::Layout self) 1450size (DC::Layout self)
1262 PPCODE: 1451 PPCODE:
1263{ 1452{
1264 int w, h; 1453 int w, h;
1265 1454
1266 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1271} 1460}
1272 1461
1273int 1462int
1274descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1275 CODE: 1464 CODE:
1276{ 1465{
1277 PangoRectangle rect; 1466 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1281} 1470}
1282 OUTPUT: 1471 OUTPUT:
1283 RETVAL 1472 RETVAL
1284 1473
1285int 1474int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1476 CODE:
1288{ 1477{
1289 int index, trailing; 1478 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1292} 1481}
1293 OUTPUT: 1482 OUTPUT:
1294 RETVAL 1483 RETVAL
1295 1484
1296void 1485void
1297cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1487 PPCODE:
1299{ 1488{
1300 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1491
1303 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1496}
1308 1497
1309void 1498void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1500 PPCODE:
1312{ 1501{
1313 int line, x; 1502 int line, x;
1314 1503
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1507 --line;
1508#endif
1318 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1512}
1322 1513
1323void 1514void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1516 PPCODE:
1326{ 1517{
1327 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1328 int index, trailing; 1519 int index, trailing;
1329 1520
1330 if (line < 0) 1521 if (line < 0)
1331 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1332 1523
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1335 1526
1336 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);
1337 1528
1338 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1536 }
1346} 1537}
1347 1538
1348void 1539void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1541 CODE:
1351 rc_clear (self->rc); 1542 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1353 self->pl, 1544 self->pl,
1354 self->rc, 1545 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1550 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1551 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1552 pango_layout_context_changed (self->pl);
1362 1553
1363void 1554void
1364draw (CFPlus::Layout self) 1555draw (DC::Layout self)
1365 CODE: 1556 CODE:
1366{ 1557{
1367 glEnable (GL_TEXTURE_2D); 1558 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1560 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1568 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1569 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1570 glDisable (GL_TEXTURE_2D);
1380} 1571}
1381 1572
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1574
1384PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1385 1576
1386void 1577void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1657 RETVAL = width > 0;
1467} 1658}
1468 OUTPUT: 1659 OUTPUT:
1469 RETVAL 1660 RETVAL
1470 1661
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1663
1473PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1474 1665
1475CFPlus::Map 1666DC::Map
1476new (SV *class) 1667new (SV *class)
1477 CODE: 1668 CODE:
1478 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1670 RETVAL->x = 0;
1480 RETVAL->y = 0; 1671 RETVAL->y = 0;
1488 RETVAL->row = 0; 1679 RETVAL->row = 0;
1489 OUTPUT: 1680 OUTPUT:
1490 RETVAL 1681 RETVAL
1491 1682
1492void 1683void
1493DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1494 CODE: 1685 CODE:
1495{ 1686{
1496 map_clear (self); 1687 map_clear (self);
1497 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1498 Safefree (self->tex); 1689 Safefree (self->tex);
1499 Safefree (self); 1690 Safefree (self);
1500} 1691}
1501 1692
1502void 1693void
1503resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1695 CODE:
1505 self->w = map_width; 1696 self->w = map_width;
1506 self->h = map_height; 1697 self->h = map_height;
1507 1698
1508void 1699void
1509clear (CFPlus::Map self) 1700clear (DC::Map self)
1510 CODE: 1701 CODE:
1511 map_clear (self); 1702 map_clear (self);
1512 1703
1513void 1704void
1514set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1706 CODE:
1516{ 1707{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1709 need_texid (self, tile);
1519} 1710}
1520 1711
1521void 1712void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1714 CODE:
1524{ 1715{
1525 tileid texid; 1716 tileid texid;
1526 maptex *tex; 1717 maptex *tex;
1527 1718
1540 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1542} 1733}
1543 1734
1544void 1735void
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) 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)
1546 CODE: 1737 CODE:
1547{ 1738{
1548 need_texid (self, texid); 1739 need_texid (self, texid);
1549 1740
1550 { 1741 {
1570 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1763}
1573 1764
1574int 1765int
1575ox (CFPlus::Map self) 1766ox (DC::Map self)
1576 ALIAS: 1767 ALIAS:
1577 oy = 1 1768 oy = 1
1578 x = 2 1769 x = 2
1579 y = 3 1770 y = 3
1580 w = 4 1771 w = 4
1591 } 1782 }
1592 OUTPUT: 1783 OUTPUT:
1593 RETVAL 1784 RETVAL
1594 1785
1595void 1786void
1596scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1597 CODE: 1788 CODE:
1598{ 1789{
1599 if (dx > 0) 1790 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1792 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1618 } 1809 }
1619} 1810}
1620 1811
1621SV * 1812SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1814 CODE:
1624{ 1815{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1818 mapcell *cell;
1655 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1656 1847
1657 do 1848 do
1658 { 1849 {
1659 ext = *data++; 1850 ext = *data++;
1660 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1661 1852
1662 if (cmd < 4) 1853 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1665 { 1856 {
1668 } 1859 }
1669 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1672 { 1863 {
1673 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1674 ; // 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);
1675 1868
1676 data += *data + 1; 1869 data += *data + 1;
1677 } 1870 }
1678 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1872 cell->flags = *data++;
1709 } 1902 }
1710 } 1903 }
1711 } 1904 }
1712 } 1905 }
1713 else 1906 else
1714 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1715 } 1908 }
1716} 1909}
1717 OUTPUT: 1910 OUTPUT:
1718 RETVAL 1911 RETVAL
1719 1912
1720SV * 1913SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1915 CODE:
1723{ 1916{
1724 int x1, x; 1917 int x1, x;
1725 int y1, y; 1918 int y1, y;
1726 int z; 1919 int z;
1771} 1964}
1772 OUTPUT: 1965 OUTPUT:
1773 RETVAL 1966 RETVAL
1774 1967
1775void 1968void
1776draw (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)
1777 CODE: 1970 CODE:
1778{ 1971{
1779 int x, y, z; 1972 int x, y, z;
1780 1973
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 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
1783 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)
1784 smooth_key skey; 1977 smooth_key skey;
1785 1978 int pl_x, pl_y;
1979 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1980 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1981 rc_key_t key;
1788 rc_array_t *arr; 1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1789 1985
1790 // thats current max. sorry. 1986 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1793 1989
1848 tileid tile = cell->tile [z]; 2044 tileid tile = cell->tile [z];
1849 2045
1850 if (tile) 2046 if (tile)
1851 { 2047 {
1852 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1853 int px, py; 2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1854 2051
1855 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1856 { 2053 {
1857 if (!tex.name) 2054 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1859 2056
1860 key.texname = tex.name; 2057 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1862 } 2059 }
1863 2060
1864 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1866 2068
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 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);
1869 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);
1870 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);
1871 2073
1872 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 2075 {
1874 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 2077 if (cell->flags & 1)
1876 { 2078 {
1877 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
2016 } 2218 }
2017 2219
2018 hv_clear (smooth); 2220 hv_clear (smooth);
2019 } 2221 }
2020 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
2021 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2022 rc_free (rc); 2241 rc_free (rc);
2023 2242
2024 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
2052 } 2271 }
2053 } 2272 }
2054} 2273}
2055 2274
2056void 2275void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2277 CODE:
2059{ 2278{
2060 static float color[16][3] = { 2279 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2280 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2281 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2331 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2332 glDisable (GL_TEXTURE_2D);
2114} 2333}
2115 2334
2116void 2335void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2336fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2337 PPCODE:
2119{ 2338{
2120 int x, y; 2339 int x, y;
2121 int sw1 = sw + 2; 2340 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2341 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2350
2132 mx += self->x - 1; 2351 mx += self->x - 1;
2133 my += self->y - 1; 2352 my += self->y - 1;
2134 2353
2135 memset (darkness1, 255, sw1 * sh1); 2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2355
2137 for (y = 0; y < sh1; y++) 2356 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
2139 { 2358 {
2140 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2412 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2413 PUSHs (darkness3_sv);
2195} 2414}
2196 2415
2197SV * 2416SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2417get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2418 CODE:
2200{ 2419{
2201 int x, y, x1, y1; 2420 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2421 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2422 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2479 else
2261 *data++ = 0; 2480 *data++ = 0;
2262 } 2481 }
2263 } 2482 }
2264 2483
2484 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 {
2265 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 }
2490
2267 RETVAL = data_sv; 2491 RETVAL = data_sv;
2268} 2492}
2269 OUTPUT: 2493 OUTPUT:
2270 RETVAL 2494 RETVAL
2271 2495
2272void 2496void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2497set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2498 PPCODE:
2275{ 2499{
2276 int x, y, z; 2500 int x, y, z;
2277 int w, h; 2501 int w, h;
2278 int x1, y1; 2502 int x1, y1;
2503 STRLEN len;
2504 uint8_t *data, *end;
2505
2506 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv);
2509 end = data + len + 8;
2510
2511 if (len < 5)
2512 XSRETURN_EMPTY;
2279 2513
2280 if (*data++ != 0) 2514 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2515 XSRETURN_EMPTY; /* version mismatch */
2282 2516
2283 w = *data++ << 8; w |= *data++; 2517 w = *data++ << 8; w |= *data++;
2298 { 2532 {
2299 maprow *row = map_get_row (self, y); 2533 maprow *row = map_get_row (self, y);
2300 2534
2301 for (x = x0; x < x1; x++) 2535 for (x = x0; x < x1; x++)
2302 { 2536 {
2537 uint8_t flags;
2538
2539 if (data + 7 >= end)
2540 XSRETURN_EMPTY;
2541
2303 uint8_t flags = *data++; 2542 flags = *data++;
2304 2543
2305 if (flags) 2544 if (flags)
2306 { 2545 {
2307 mapcell *cell = row_get_cell (row, x); 2546 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2547 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2552
2314 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
2315 { 2554 {
2316 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
2317 2557
2318 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
2319 { 2559 {
2320 tileid t = tile [z]; 2560 tileid t = tile [z];
2321 2561
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2563 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2565 need_texid (self, t);
2326 } 2566 }
2327 2567
2328 cell->tile [z] = t; 2568 cell->tile [z] = t;
2329 } 2569 }
2331 } 2571 }
2332 } 2572 }
2333 } 2573 }
2334} 2574}
2335 2575
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2576MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2577
2338CFPlus::RW 2578DC::RW
2339new (SV *class, SV *data_sv) 2579new (SV *class, SV *data_sv)
2340 CODE: 2580 CODE:
2341{ 2581{
2342 STRLEN datalen; 2582 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2583 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2585 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2586}
2347 OUTPUT: 2587 OUTPUT:
2348 RETVAL 2588 RETVAL
2349 2589
2350CFPlus::RW 2590DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2591new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2592 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2593 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2594 OUTPUT:
2355 RETVAL 2595 RETVAL
2356 2596
2357# fails on win32: 2597# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2598# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2599#void
2360#close (CFPlus::RW self) 2600#close (DC::RW self)
2361# CODE: 2601# CODE:
2362# (self->(close)) (self); 2602# (self->(close)) (self);
2363 2603
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2604MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2605
2366PROTOTYPES: DISABLE 2606PROTOTYPES: DISABLE
2367 2607
2368CFPlus::Channel 2608DC::Channel
2369find () 2609find ()
2370 CODE: 2610 CODE:
2371{ 2611{
2372 RETVAL = Mix_GroupAvailable (-1); 2612 RETVAL = Mix_GroupAvailable (-1);
2373 2613
2386} 2626}
2387 OUTPUT: 2627 OUTPUT:
2388 RETVAL 2628 RETVAL
2389 2629
2390void 2630void
2391halt (CFPlus::Channel self) 2631halt (DC::Channel self)
2392 CODE: 2632 CODE:
2393 Mix_HaltChannel (self); 2633 Mix_HaltChannel (self);
2394 2634
2395void 2635void
2396expire (CFPlus::Channel self, int ticks = -1) 2636expire (DC::Channel self, int ticks = -1)
2397 CODE: 2637 CODE:
2398 Mix_ExpireChannel (self, ticks); 2638 Mix_ExpireChannel (self, ticks);
2399 2639
2400void 2640void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2641fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2642 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2643 Mix_FadeOutChannel (self, ticks);
2404 2644
2405int 2645int
2406volume (CFPlus::Channel self, int volume) 2646volume (DC::Channel self, int volume)
2407 CODE: 2647 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2648 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2649 OUTPUT:
2410 RETVAL 2650 RETVAL
2411 2651
2412void 2652void
2413unregister_all_effects (CFPlus::Channel self) 2653unregister_all_effects (DC::Channel self)
2414 CODE: 2654 CODE:
2415 Mix_UnregisterAllEffects (self); 2655 Mix_UnregisterAllEffects (self);
2416 2656
2417void 2657void
2418set_panning (CFPlus::Channel self, int left, int right) 2658set_panning (DC::Channel self, int left, int right)
2419 CODE: 2659 CODE:
2420 left = CLAMP (left , 0, 255); 2660 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2661 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2662 Mix_SetPanning (self, left, right);
2423 2663
2424void 2664void
2425set_distance (CFPlus::Channel self, int distance) 2665set_distance (DC::Channel self, int distance)
2426 CODE: 2666 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2667 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2668
2429void 2669void
2430set_position (CFPlus::Channel self, int angle, int distance) 2670set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2671 CODE:
2432 2672
2433void 2673void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2675 CODE:
2436{ 2676{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2677 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); 2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2680}
2441 2681
2442void 2682void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2683set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2684 CODE:
2445 Mix_SetReverseStereo (self, flip); 2685 Mix_SetReverseStereo (self, flip);
2446 2686
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2688
2449PROTOTYPES: DISABLE 2689PROTOTYPES: DISABLE
2450 2690
2451CFPlus::MixChunk 2691DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2692new (SV *class, DC::RW rwops)
2453 CODE: 2693 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2694 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2695 OUTPUT:
2456 RETVAL 2696 RETVAL
2457 2697
2458void 2698void
2459DESTROY (CFPlus::MixChunk self) 2699DESTROY (DC::MixChunk self)
2460 CODE: 2700 CODE:
2461 Mix_FreeChunk (self); 2701 Mix_FreeChunk (self);
2462 2702
2463int 2703int
2464volume (CFPlus::MixChunk self, int volume = -1) 2704volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2705 CODE:
2466 if (items > 1) 2706 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2707 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2708 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2709 OUTPUT:
2470 RETVAL 2710 RETVAL
2471 2711
2472CFPlus::Channel 2712DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2713play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2714 CODE:
2475{ 2715{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2716 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2717
2478 if (RETVAL < 0) 2718 if (RETVAL < 0)
2485 } 2725 }
2486} 2726}
2487 OUTPUT: 2727 OUTPUT:
2488 RETVAL 2728 RETVAL
2489 2729
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2731
2492int 2732int
2493volume (int volume = -1) 2733volume (int volume = -1)
2494 PROTOTYPE: ;$ 2734 PROTOTYPE: ;$
2495 CODE: 2735 CODE:
2507void 2747void
2508halt () 2748halt ()
2509 CODE: 2749 CODE:
2510 Mix_HaltMusic (); 2750 Mix_HaltMusic ();
2511 2751
2512CFPlus::MixMusic 2752DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2753new (SV *class, DC::RW rwops)
2514 CODE: 2754 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2755 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2756 OUTPUT:
2517 RETVAL 2757 RETVAL
2518 2758
2519void 2759void
2520DESTROY (CFPlus::MixMusic self) 2760DESTROY (DC::MixMusic self)
2521 CODE: 2761 CODE:
2522 Mix_FreeMusic (self); 2762 Mix_FreeMusic (self);
2523 2763
2524int 2764int
2525play (CFPlus::MixMusic self, int loops = -1) 2765play (DC::MixMusic self, int loops = -1)
2526 CODE: 2766 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2767 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2768 OUTPUT:
2529 RETVAL 2769 RETVAL
2530 2770
2531void 2771void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2772fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2773 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2774 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2775
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2776MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2777
2538PROTOTYPES: ENABLE 2778PROTOTYPES: ENABLE
2539 2779
2540BOOT: 2780BOOT:
2541{ 2781{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2782 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2783 static const struct {
2544 const char *name; 2784 const char *name;
2545 IV iv; 2785 IV iv;
2546 } *civ, const_iv[] = { 2786 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2787# define const_iv(name) { # name, (IV)name }
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3080void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3081 CODE:
2842 if (gl.SeparableFilter2D) 3082 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3083 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3084
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3085void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3086
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3087void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3088
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3089void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3090
2876 3116
2877void glEndList () 3117void glEndList ()
2878 3118
2879void glCallList (int list) 3119void glCallList (int list)
2880 3120
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3121MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3122
2883PROTOTYPES: DISABLE 3123PROTOTYPES: DISABLE
2884 3124
2885void 3125void
2886find_widget (SV *self, NV x, NV y) 3126find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3130 XPUSHs (self);
2891} 3131}
2892 3132
2893BOOT: 3133BOOT:
2894{ 3134{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3135 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3136
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3137 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); 3138 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); 3139 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); 3140 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3141}
2902 3142
2903void 3143void
2904draw (SV *self) 3144draw (SV *self)
2905 CODE: 3145 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3152 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3153 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3154 double draw_x, draw_y;
2915 3155
2916 if (!SvROK (self)) 3156 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3157 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3158
2919 hv = (HV *)SvRV (self); 3159 hv = (HV *)SvRV (self);
2920 3160
2921 if (SvTYPE (hv) != SVt_PVHV) 3161 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3162 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3163
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3164 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.; 3165 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3166
2927 if (!h || !w) 3167 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines