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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines