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.240 by root, Wed Dec 26 18:09:30 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
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
1060glyph_cache_backup () 1241glyph_cache_backup ()
1066glyph_cache_restore () 1247glyph_cache_restore ()
1067 PROTOTYPE: 1248 PROTOTYPE:
1068 CODE: 1249 CODE:
1069 tc_restore (); 1250 tc_restore ();
1070 1251
1071CFPlus::Layout 1252DC::Layout
1072new (SV *class) 1253new (SV *class)
1073 CODE: 1254 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1075 1256
1076 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1087 OUTPUT: 1268 OUTPUT:
1088 RETVAL 1269 RETVAL
1089 1270
1090void 1271void
1091DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1092 CODE: 1273 CODE:
1093 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1094 rc_free (self->rc); 1275 rc_free (self->rc);
1095 Safefree (self); 1276 Safefree (self);
1096 1277
1097void 1278void
1098set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1099 CODE: 1280 CODE:
1100{ 1281{
1101 STRLEN textlen; 1282 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1103 1284
1104 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1105} 1286}
1106 1287
1107void 1288void
1108set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1109 CODE: 1290 CODE:
1110{ 1291{
1111 STRLEN textlen; 1292 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1113 1294
1114 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1115} 1296}
1116 1297
1117void 1298void
1118set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1119 CODE: 1300 CODE:
1120{ 1301{
1121 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1304 const char *pos = text;
1158 if (attrs) 1339 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1160} 1341}
1161 1342
1162void 1343void
1163get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1164 PPCODE: 1345 PPCODE:
1165{ 1346{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1348
1168 do 1349 do
1169 { 1350 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1352
1172 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1173 { 1354 {
1174 PangoRectangle extents; 1355 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1364
1184 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1185} 1366}
1186 1367
1187int 1368int
1188has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1189 CODE: 1370 CODE:
1190{ 1371{
1191 int lines = 1; 1372 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1193 1374
1198} 1379}
1199 OUTPUT: 1380 OUTPUT:
1200 RETVAL 1381 RETVAL
1201 1382
1202SV * 1383SV *
1203get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1204 CODE: 1385 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1388 OUTPUT:
1208 RETVAL 1389 RETVAL
1209 1390
1210void 1391void
1211set_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.)
1212 CODE: 1393 CODE:
1213 self->r = r; 1394 self->r = r;
1214 self->g = g; 1395 self->g = g;
1215 self->b = b; 1396 self->b = b;
1216 self->a = a; 1397 self->a = a;
1217 1398
1218void 1399void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1401 CODE:
1221 if (self->font != font) 1402 if (self->font != font)
1222 { 1403 {
1223 self->font = font; 1404 self->font = font;
1224 layout_update_font (self); 1405 layout_update_font (self);
1225 } 1406 }
1226 1407
1227void 1408void
1228set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1229 CODE: 1410 CODE:
1230 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1231 { 1412 {
1232 self->base_height = base_height; 1413 self->base_height = base_height;
1233 layout_update_font (self); 1414 layout_update_font (self);
1234 } 1415 }
1235 1416
1236void 1417void
1237set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1419 CODE:
1239 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);
1240 1421
1241void 1422void
1242set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1243 CODE: 1424 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1426
1246void 1427void
1247set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1248 CODE: 1429 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1431
1251void 1432void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1434 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1259 ); 1440 );
1260 1441
1261void 1442void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1444 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1446
1266void 1447void
1267size (CFPlus::Layout self) 1448size (DC::Layout self)
1268 PPCODE: 1449 PPCODE:
1269{ 1450{
1270 int w, h; 1451 int w, h;
1271 1452
1272 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1277} 1458}
1278 1459
1279int 1460int
1280descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1281 CODE: 1462 CODE:
1282{ 1463{
1283 PangoRectangle rect; 1464 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1287} 1468}
1288 OUTPUT: 1469 OUTPUT:
1289 RETVAL 1470 RETVAL
1290 1471
1291int 1472int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1474 CODE:
1294{ 1475{
1295 int index, trailing; 1476 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1298} 1479}
1299 OUTPUT: 1480 OUTPUT:
1300 RETVAL 1481 RETVAL
1301 1482
1302void 1483void
1303cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1485 PPCODE:
1305{ 1486{
1306 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1489
1309 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1494}
1314 1495
1315void 1496void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1498 PPCODE:
1318{ 1499{
1319 int line, x; 1500 int line, x;
1320 1501
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1505 --line;
1506#endif
1324 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1510}
1328 1511
1329void 1512void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1514 PPCODE:
1332{ 1515{
1333 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1334 int index, trailing; 1517 int index, trailing;
1335 1518
1336 if (line < 0) 1519 if (line < 0)
1337 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1338 1521
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1341 1524
1342 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);
1343 1526
1344 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1534 }
1352} 1535}
1353 1536
1354void 1537void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1539 CODE:
1357 rc_clear (self->rc); 1540 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1359 self->pl, 1542 self->pl,
1360 self->rc, 1543 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1548 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1549 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1550 pango_layout_context_changed (self->pl);
1368 1551
1369void 1552void
1370draw (CFPlus::Layout self) 1553draw (DC::Layout self)
1371 CODE: 1554 CODE:
1372{ 1555{
1373 glEnable (GL_TEXTURE_2D); 1556 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1558 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1566 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1567 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1568 glDisable (GL_TEXTURE_2D);
1386} 1569}
1387 1570
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1572
1390PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1391 1574
1392void 1575void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1655 RETVAL = width > 0;
1473} 1656}
1474 OUTPUT: 1657 OUTPUT:
1475 RETVAL 1658 RETVAL
1476 1659
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1661
1479PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1480 1663
1481CFPlus::Map 1664DC::Map
1482new (SV *class) 1665new (SV *class)
1483 CODE: 1666 CODE:
1484 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1668 RETVAL->x = 0;
1486 RETVAL->y = 0; 1669 RETVAL->y = 0;
1494 RETVAL->row = 0; 1677 RETVAL->row = 0;
1495 OUTPUT: 1678 OUTPUT:
1496 RETVAL 1679 RETVAL
1497 1680
1498void 1681void
1499DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1500 CODE: 1683 CODE:
1501{ 1684{
1502 map_clear (self); 1685 map_clear (self);
1503 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1504 Safefree (self->tex); 1687 Safefree (self->tex);
1505 Safefree (self); 1688 Safefree (self);
1506} 1689}
1507 1690
1508void 1691void
1509resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1693 CODE:
1511 self->w = map_width; 1694 self->w = map_width;
1512 self->h = map_height; 1695 self->h = map_height;
1513 1696
1514void 1697void
1515clear (CFPlus::Map self) 1698clear (DC::Map self)
1516 CODE: 1699 CODE:
1517 map_clear (self); 1700 map_clear (self);
1518 1701
1519void 1702void
1520set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1704 CODE:
1522{ 1705{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1707 need_texid (self, tile);
1525} 1708}
1526 1709
1527void 1710void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1712 CODE:
1530{ 1713{
1531 tileid texid; 1714 tileid texid;
1532 maptex *tex; 1715 maptex *tex;
1533 1716
1546 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1548} 1731}
1549 1732
1550void 1733void
1551set_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)
1552 CODE: 1735 CODE:
1553{ 1736{
1554 need_texid (self, texid); 1737 need_texid (self, texid);
1555 1738
1556 { 1739 {
1576 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1761}
1579 1762
1580int 1763int
1581ox (CFPlus::Map self) 1764ox (DC::Map self)
1582 ALIAS: 1765 ALIAS:
1583 oy = 1 1766 oy = 1
1584 x = 2 1767 x = 2
1585 y = 3 1768 y = 3
1586 w = 4 1769 w = 4
1597 } 1780 }
1598 OUTPUT: 1781 OUTPUT:
1599 RETVAL 1782 RETVAL
1600 1783
1601void 1784void
1602scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1603 CODE: 1786 CODE:
1604{ 1787{
1605 if (dx > 0) 1788 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1790 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1624 } 1807 }
1625} 1808}
1626 1809
1627SV * 1810SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1812 CODE:
1630{ 1813{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1816 mapcell *cell;
1661 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1662 1845
1663 do 1846 do
1664 { 1847 {
1665 ext = *data++; 1848 ext = *data++;
1666 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1667 1850
1668 if (cmd < 4) 1851 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1671 { 1854 {
1674 } 1857 }
1675 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1678 { 1861 {
1679 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1866
1682 data += *data + 1; 1867 data += *data + 1;
1683 } 1868 }
1684 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1870 cell->flags = *data++;
1715 } 1900 }
1716 } 1901 }
1717 } 1902 }
1718 } 1903 }
1719 else 1904 else
1720 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1721 } 1906 }
1722} 1907}
1723 OUTPUT: 1908 OUTPUT:
1724 RETVAL 1909 RETVAL
1725 1910
1726SV * 1911SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1913 CODE:
1729{ 1914{
1730 int x1, x; 1915 int x1, x;
1731 int y1, y; 1916 int y1, y;
1732 int z; 1917 int z;
1777} 1962}
1778 OUTPUT: 1963 OUTPUT:
1779 RETVAL 1964 RETVAL
1780 1965
1781void 1966void
1782draw (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)
1783 CODE: 1968 CODE:
1784{ 1969{
1785 int x, y, z; 1970 int x, y, z;
1786 1971
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 1975 smooth_key skey;
1791 1976 int pl_x, pl_y;
1977 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1978 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1979 rc_key_t key;
1794 rc_array_t *arr; 1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1795 1983
1796 // thats current max. sorry. 1984 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1799 1987
1854 tileid tile = cell->tile [z]; 2042 tileid tile = cell->tile [z];
1855 2043
1856 if (tile) 2044 if (tile)
1857 { 2045 {
1858 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1859 int px, py; 2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1860 2049
1861 if (key.texname != tex.name) 2050 if (key.texname != tex.name)
1862 { 2051 {
1863 if (!tex.name) 2052 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1865 2054
1866 key.texname = tex.name; 2055 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2056 arr = rc_array (rc, &key);
1868 } 2057 }
1869 2058
1870 px = (x + 1) * T - tex.w; 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
1872 2066
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877 2071
1878 if (cell->flags && z == 2) 2072 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2073 {
1880 // overlays such as the speech bubble, probably more to come 2074 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2075 if (cell->flags & 1)
1882 { 2076 {
1883 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
2022 } 2216 }
2023 2217
2024 hv_clear (smooth); 2218 hv_clear (smooth);
2025 } 2219 }
2026 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
2027 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2028 rc_free (rc); 2239 rc_free (rc);
2029 2240
2030 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2058 } 2269 }
2059 } 2270 }
2060} 2271}
2061 2272
2062void 2273void
2063draw_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)
2064 CODE: 2275 CODE:
2065{ 2276{
2066 static float color[16][3] = { 2277 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2120} 2331}
2121 2332
2122void 2333void
2123fow_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)
2124 PPCODE: 2335 PPCODE:
2125{ 2336{
2126 int x, y; 2337 int x, y;
2127 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2348
2138 mx += self->x - 1; 2349 mx += self->x - 1;
2139 my += self->y - 1; 2350 my += self->y - 1;
2140 2351
2141 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2353
2143 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2145 { 2356 {
2146 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2201} 2412}
2202 2413
2203SV * 2414SV *
2204get_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)
2205 CODE: 2416 CODE:
2206{ 2417{
2207 int x, y, x1, y1; 2418 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2477 else
2267 *data++ = 0; 2478 *data++ = 0;
2268 } 2479 }
2269 } 2480 }
2270 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 {
2271 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2273 RETVAL = data_sv; 2489 RETVAL = data_sv;
2274} 2490}
2275 OUTPUT: 2491 OUTPUT:
2276 RETVAL 2492 RETVAL
2277 2493
2278void 2494void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2496 PPCODE:
2281{ 2497{
2282 int x, y, z; 2498 int x, y, z;
2283 int w, h; 2499 int w, h;
2284 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;
2285 2511
2286 if (*data++ != 0) 2512 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2288 2514
2289 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2304 { 2530 {
2305 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2306 2532
2307 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2308 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2309 uint8_t flags = *data++; 2540 flags = *data++;
2310 2541
2311 if (flags) 2542 if (flags)
2312 { 2543 {
2313 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2550
2320 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2321 { 2552 {
2322 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2323 2555
2324 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2325 { 2557 {
2326 tileid t = tile [z]; 2558 tileid t = tile [z];
2327 2559
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2561 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2563 need_texid (self, t);
2332 } 2564 }
2333 2565
2334 cell->tile [z] = t; 2566 cell->tile [z] = t;
2335 } 2567 }
2337 } 2569 }
2338 } 2570 }
2339 } 2571 }
2340} 2572}
2341 2573
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2575
2344CFPlus::RW 2576DC::RW
2345new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2346 CODE: 2578 CODE:
2347{ 2579{
2348 STRLEN datalen; 2580 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2584}
2353 OUTPUT: 2585 OUTPUT:
2354 RETVAL 2586 RETVAL
2355 2587
2356CFPlus::RW 2588DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2590 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2591 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2592 OUTPUT:
2361 RETVAL 2593 RETVAL
2362 2594
2363# fails on win32: 2595# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2596# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2597#void
2366#close (CFPlus::RW self) 2598#close (DC::RW self)
2367# CODE: 2599# CODE:
2368# (self->(close)) (self); 2600# (self->(close)) (self);
2369 2601
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2603
2372PROTOTYPES: DISABLE 2604PROTOTYPES: DISABLE
2373 2605
2374CFPlus::Channel 2606DC::Channel
2375find () 2607find ()
2376 CODE: 2608 CODE:
2377{ 2609{
2378 RETVAL = Mix_GroupAvailable (-1); 2610 RETVAL = Mix_GroupAvailable (-1);
2379 2611
2392} 2624}
2393 OUTPUT: 2625 OUTPUT:
2394 RETVAL 2626 RETVAL
2395 2627
2396void 2628void
2397halt (CFPlus::Channel self) 2629halt (DC::Channel self)
2398 CODE: 2630 CODE:
2399 Mix_HaltChannel (self); 2631 Mix_HaltChannel (self);
2400 2632
2401void 2633void
2402expire (CFPlus::Channel self, int ticks = -1) 2634expire (DC::Channel self, int ticks = -1)
2403 CODE: 2635 CODE:
2404 Mix_ExpireChannel (self, ticks); 2636 Mix_ExpireChannel (self, ticks);
2405 2637
2406void 2638void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2639fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2640 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2641 Mix_FadeOutChannel (self, ticks);
2410 2642
2411int 2643int
2412volume (CFPlus::Channel self, int volume) 2644volume (DC::Channel self, int volume)
2413 CODE: 2645 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2647 OUTPUT:
2416 RETVAL 2648 RETVAL
2417 2649
2418void 2650void
2419unregister_all_effects (CFPlus::Channel self) 2651unregister_all_effects (DC::Channel self)
2420 CODE: 2652 CODE:
2421 Mix_UnregisterAllEffects (self); 2653 Mix_UnregisterAllEffects (self);
2422 2654
2423void 2655void
2424set_panning (CFPlus::Channel self, int left, int right) 2656set_panning (DC::Channel self, int left, int right)
2425 CODE: 2657 CODE:
2426 left = CLAMP (left , 0, 255); 2658 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2659 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2660 Mix_SetPanning (self, left, right);
2429 2661
2430void 2662void
2431set_distance (CFPlus::Channel self, int distance) 2663set_distance (DC::Channel self, int distance)
2432 CODE: 2664 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2666
2435void 2667void
2436set_position (CFPlus::Channel self, int angle, int distance) 2668set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2669 CODE:
2438 2670
2439void 2671void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2673 CODE:
2442{ 2674{
2443 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));
2444 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);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2678}
2447 2679
2448void 2680void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2681set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2682 CODE:
2451 Mix_SetReverseStereo (self, flip); 2683 Mix_SetReverseStereo (self, flip);
2452 2684
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2686
2455PROTOTYPES: DISABLE 2687PROTOTYPES: DISABLE
2456 2688
2457CFPlus::MixChunk 2689DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2690new (SV *class, DC::RW rwops)
2459 CODE: 2691 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2693 OUTPUT:
2462 RETVAL 2694 RETVAL
2463 2695
2464void 2696void
2465DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2466 CODE: 2698 CODE:
2467 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2468 2700
2469int 2701int
2470volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2703 CODE:
2472 if (items > 1) 2704 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2705 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2707 OUTPUT:
2476 RETVAL 2708 RETVAL
2477 2709
2478CFPlus::Channel 2710DC::Channel
2479play (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)
2480 CODE: 2712 CODE:
2481{ 2713{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2715
2484 if (RETVAL < 0) 2716 if (RETVAL < 0)
2491 } 2723 }
2492} 2724}
2493 OUTPUT: 2725 OUTPUT:
2494 RETVAL 2726 RETVAL
2495 2727
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2729
2498int 2730int
2499volume (int volume = -1) 2731volume (int volume = -1)
2500 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2501 CODE: 2733 CODE:
2513void 2745void
2514halt () 2746halt ()
2515 CODE: 2747 CODE:
2516 Mix_HaltMusic (); 2748 Mix_HaltMusic ();
2517 2749
2518CFPlus::MixMusic 2750DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2751new (SV *class, DC::RW rwops)
2520 CODE: 2752 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2754 OUTPUT:
2523 RETVAL 2755 RETVAL
2524 2756
2525void 2757void
2526DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2527 CODE: 2759 CODE:
2528 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2529 2761
2530int 2762int
2531play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2532 CODE: 2764 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2766 OUTPUT:
2535 RETVAL 2767 RETVAL
2536 2768
2537void 2769void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2771 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2773
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2775
2544PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2545 2777
2546BOOT: 2778BOOT:
2547{ 2779{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2781 static const struct {
2550 const char *name; 2782 const char *name;
2551 IV iv; 2783 IV iv;
2552 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3079 CODE:
2848 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3082
2851void 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)
2852 3084
2853void 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)
2854 3086
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3088
2882 3114
2883void glEndList () 3115void glEndList ()
2884 3116
2885void glCallList (int list) 3117void glCallList (int list)
2886 3118
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3120
2889PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2890 3122
2891void 3123void
2892find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3128 XPUSHs (self);
2897} 3129}
2898 3130
2899BOOT: 3131BOOT:
2900{ 3132{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3134
2903 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);
2904 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);
2905 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);
2906 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);
2907} 3139}
2908 3140
2909void 3141void
2910draw (SV *self) 3142draw (SV *self)
2911 CODE: 3143 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3152 double draw_x, draw_y;
2921 3153
2922 if (!SvROK (self)) 3154 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3156
2925 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2926 3158
2927 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3161
2930 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.;
2931 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.;
2932 3164
2933 if (!h || !w) 3165 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines