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.227 by root, Mon Aug 13 14:15:09 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);
203 227
204typedef uint16_t tileid; 228typedef uint16_t tileid;
205typedef uint16_t faceid; 229typedef uint16_t faceid;
206 230
207typedef struct { 231typedef struct {
208 int name; 232 GLuint name;
209 int w, h; 233 int w, h;
210 float s, t; 234 float s, t;
211 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
212 tileid smoothtile; 236 tileid smoothtile;
213 uint8_t smoothlevel; 237 uint8_t smoothlevel;
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 {
440 n |= n >> 16; 471 n |= n >> 16;
441 472
442 return n + 1; 473 return n + 1;
443} 474}
444 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
445/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
448 490
449/******************************************************************************/ 491/******************************************************************************/
487 return 0; 529 return 0;
488 530
489 return 1; 531 return 1;
490} 532}
491 533
492MODULE = 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
493 585
494PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
495 587
496BOOT: 588BOOT:
497{ 589{
498 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 591 static const struct {
500 const char *name; 592 const char *name;
501 IV iv; 593 IV iv;
502 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
525 617
526 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
529 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),
671
672 const_iv (SDLK_FIRST),
673 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
755
756 const_iv (KMOD_LRAM),
757
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)
611# undef const_iv 788# undef const_iv
612 }; 789 };
613 790
614 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; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 810
634NV floor (NV x) 811NV floor (NV x)
635 812
636NV ceil (NV x) 813NV ceil (NV x)
637 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
638void 819void
639pango_init () 820pango_init ()
640 CODE: 821 CODE:
641{ 822{
642 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 831}
646 832
647char *
648SDL_GetError () 833char *SDL_GetError ()
649 834
650int 835void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 836
653void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
654SDL_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
655 853
656void 854void
657SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
658 PPCODE: 856 PPCODE:
659{ 857{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 872
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 875
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 877
683 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
684 while (*m) 879 while (*m)
685 { 880 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 882 {
688 AV *av = newAV (); 883 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
715 910
716 if (RETVAL) 911 if (RETVAL)
717 { 912 {
718 av_clear (texture_av); 913 av_clear (texture_av);
719 914
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 917#include "glfunc.h"
723#undef GL_FUNC 918#undef GL_FUNC
724 } 919 }
725} 920}
732char * 927char *
733SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
734 929
735int 930int
736SDL_GetAppState () 931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
737 935
738void 936void
739poll_events () 937poll_events ()
740 PPCODE: 938 PPCODE:
741{ 939{
751 { 949 {
752 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
753 case SDL_KEYUP: 951 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 957 break;
760 958
761 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 978 x = ev.motion.x;
781 y = ev.motion.y; 979 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 981 }
784 982
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 989 }
792 break; 990 break;
793 991
794 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 995
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1006 break;
809 } 1007 }
810 1008
811 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))));
812 } 1010 }
813} 1011}
814 1012
815int 1013int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1015 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
1018
1019void
1020Mix_QuerySpec ()
1021 PPCODE:
1022{
1023 int freq, channels;
1024 Uint16 format;
1025
1026 if (Mix_QuerySpec (&freq, &format, &channels))
1027 {
1028 EXTEND (SP, 3);
1029 PUSHs (sv_2mortal (newSViv (freq)));
1030 PUSHs (sv_2mortal (newSViv (format)));
1031 PUSHs (sv_2mortal (newSViv (channels)));
1032 }
1033}
820 1034
821void 1035void
822Mix_CloseAudio () 1036Mix_CloseAudio ()
823 1037
824int 1038int
859 } 1073 }
860 } 1074 }
861#endif 1075#endif
862} 1076}
863 1077
864void 1078int
865add_font (char *file) 1079add_font (char *file)
866 CODE: 1080 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
868 1084
869void 1085void
870load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
871 ALIAS: 1087 ALIAS:
872 load_image_file = 1 1088 load_image_file = 1
958void 1174void
959error (char *message) 1175error (char *message)
960 CODE: 1176 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1178#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1180#endif
965 1181
966void 1182void
967fatal (char *message) 1183fatal (char *message)
968 CODE: 1184 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1186#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1188#endif
973 _exit (1); 1189 _exit (1);
974 1190
975void 1191void
976_exit (int retval = 0) 1192_exit (int retval = 0)
988#if DEBUG 1204#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1205 VALGRIND_DO_LEAK_CHECK;
990#endif 1206#endif
991} 1207}
992 1208
993MODULE = CFPlus PACKAGE = CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
994 1210
995PROTOTYPES: DISABLE 1211PROTOTYPES: DISABLE
996 1212
997CFPlus::Font 1213DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1215 CODE:
1000{ 1216{
1001 int count; 1217 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1221}
1006 OUTPUT: 1222 OUTPUT:
1007 RETVAL 1223 RETVAL
1008 1224
1009void 1225void
1010DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
1011 CODE: 1227 CODE:
1012 pango_font_description_free (self); 1228 pango_font_description_free (self);
1013 1229
1014void 1230void
1015make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1016 PROTOTYPE: $ 1232 PROTOTYPE: $
1017 CODE: 1233 CODE:
1018 default_font = self; 1234 default_font = self;
1019 1235
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1237
1022PROTOTYPES: DISABLE 1238PROTOTYPES: DISABLE
1023 1239
1024void 1240void
1025reset_glyph_cache () 1241glyph_cache_backup ()
1026 PROTOTYPE: 1242 PROTOTYPE:
1027 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
1028 tc_clear (); 1250 tc_restore ();
1029 1251
1030CFPlus::Layout 1252DC::Layout
1031new (SV *class) 1253new (SV *class)
1032 CODE: 1254 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1034 1256
1035 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1046 OUTPUT: 1268 OUTPUT:
1047 RETVAL 1269 RETVAL
1048 1270
1049void 1271void
1050DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1051 CODE: 1273 CODE:
1052 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1053 rc_free (self->rc); 1275 rc_free (self->rc);
1054 Safefree (self); 1276 Safefree (self);
1055 1277
1056void 1278void
1057set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1058 CODE: 1280 CODE:
1059{ 1281{
1060 STRLEN textlen; 1282 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1062 1284
1063 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1064} 1286}
1065 1287
1066void 1288void
1067set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1068 CODE: 1290 CODE:
1069{ 1291{
1070 STRLEN textlen; 1292 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1072 1294
1073 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1074} 1296}
1075 1297
1076void 1298void
1077set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1078 CODE: 1300 CODE:
1079{ 1301{
1080 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1304 const char *pos = text;
1117 if (attrs) 1339 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1119} 1341}
1120 1342
1121void 1343void
1122get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1123 PPCODE: 1345 PPCODE:
1124{ 1346{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1348
1127 do 1349 do
1128 { 1350 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1352
1131 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1132 { 1354 {
1133 PangoRectangle extents; 1355 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1364
1143 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1144} 1366}
1145 1367
1146int 1368int
1147has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1148 CODE: 1370 CODE:
1149{ 1371{
1150 int lines = 1; 1372 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1152 1374
1157} 1379}
1158 OUTPUT: 1380 OUTPUT:
1159 RETVAL 1381 RETVAL
1160 1382
1161SV * 1383SV *
1162get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1163 CODE: 1385 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1388 OUTPUT:
1167 RETVAL 1389 RETVAL
1168 1390
1169void 1391void
1170set_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.)
1171 CODE: 1393 CODE:
1172 self->r = r; 1394 self->r = r;
1173 self->g = g; 1395 self->g = g;
1174 self->b = b; 1396 self->b = b;
1175 self->a = a; 1397 self->a = a;
1176 1398
1177void 1399void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1401 CODE:
1180 if (self->font != font) 1402 if (self->font != font)
1181 { 1403 {
1182 self->font = font; 1404 self->font = font;
1183 layout_update_font (self); 1405 layout_update_font (self);
1184 } 1406 }
1185 1407
1186void 1408void
1187set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1188 CODE: 1410 CODE:
1189 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1190 { 1412 {
1191 self->base_height = base_height; 1413 self->base_height = base_height;
1192 layout_update_font (self); 1414 layout_update_font (self);
1193 } 1415 }
1194 1416
1195void 1417void
1196set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1419 CODE:
1198 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);
1199 1421
1200void 1422void
1201set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1202 CODE: 1424 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1426
1205void 1427void
1206set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1207 CODE: 1429 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1431
1210void 1432void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1434 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1218 ); 1440 );
1219 1441
1220void 1442void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1444 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1446
1225void 1447void
1226size (CFPlus::Layout self) 1448size (DC::Layout self)
1227 PPCODE: 1449 PPCODE:
1228{ 1450{
1229 int w, h; 1451 int w, h;
1230 1452
1231 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1236} 1458}
1237 1459
1238int 1460int
1239descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1240 CODE: 1462 CODE:
1241{ 1463{
1242 PangoRectangle rect; 1464 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1246} 1468}
1247 OUTPUT: 1469 OUTPUT:
1248 RETVAL 1470 RETVAL
1249 1471
1250int 1472int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1474 CODE:
1253{ 1475{
1254 int index, trailing; 1476 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1257} 1479}
1258 OUTPUT: 1480 OUTPUT:
1259 RETVAL 1481 RETVAL
1260 1482
1261void 1483void
1262cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1485 PPCODE:
1264{ 1486{
1265 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1489
1268 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1494}
1273 1495
1274void 1496void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1498 PPCODE:
1277{ 1499{
1278 int line, x; 1500 int line, x;
1279 1501
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1505 --line;
1506#endif
1283 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1510}
1287 1511
1288void 1512void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1514 PPCODE:
1291{ 1515{
1292 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1293 int index, trailing; 1517 int index, trailing;
1294 1518
1295 if (line < 0) 1519 if (line < 0)
1296 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1297 1521
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1300 1524
1301 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);
1302 1526
1303 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1534 }
1311} 1535}
1312 1536
1313void 1537void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1539 CODE:
1316 rc_clear (self->rc); 1540 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1318 self->pl, 1542 self->pl,
1319 self->rc, 1543 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1548 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1549 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1550 pango_layout_context_changed (self->pl);
1327 1551
1328void 1552void
1329draw (CFPlus::Layout self) 1553draw (DC::Layout self)
1330 CODE: 1554 CODE:
1331{ 1555{
1332 glEnable (GL_TEXTURE_2D); 1556 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1558 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1566 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1567 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1568 glDisable (GL_TEXTURE_2D);
1345} 1569}
1346 1570
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1572
1349PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1574
1353void 1575void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1577 CODE:
1356{ 1578{
1433 RETVAL = width > 0; 1655 RETVAL = width > 0;
1434} 1656}
1435 OUTPUT: 1657 OUTPUT:
1436 RETVAL 1658 RETVAL
1437 1659
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1661
1440PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1441 1663
1442CFPlus::Map 1664DC::Map
1443new (SV *class) 1665new (SV *class)
1444 CODE: 1666 CODE:
1445 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1668 RETVAL->x = 0;
1447 RETVAL->y = 0; 1669 RETVAL->y = 0;
1455 RETVAL->row = 0; 1677 RETVAL->row = 0;
1456 OUTPUT: 1678 OUTPUT:
1457 RETVAL 1679 RETVAL
1458 1680
1459void 1681void
1460DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1461 CODE: 1683 CODE:
1462{ 1684{
1463 map_clear (self); 1685 map_clear (self);
1464 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1465 Safefree (self->tex); 1687 Safefree (self->tex);
1466 Safefree (self); 1688 Safefree (self);
1467} 1689}
1468 1690
1469void 1691void
1470resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1693 CODE:
1472 self->w = map_width; 1694 self->w = map_width;
1473 self->h = map_height; 1695 self->h = map_height;
1474 1696
1475void 1697void
1476clear (CFPlus::Map self) 1698clear (DC::Map self)
1477 CODE: 1699 CODE:
1478 map_clear (self); 1700 map_clear (self);
1479 1701
1480void 1702void
1481set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1704 CODE:
1483{ 1705{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1707 need_texid (self, tile);
1486} 1708}
1487 1709
1488void 1710void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1712 CODE:
1491{ 1713{
1492 tileid texid; 1714 tileid texid;
1493 maptex *tex; 1715 maptex *tex;
1494 1716
1507 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1509} 1731}
1510 1732
1511void 1733void
1512set_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)
1513 CODE: 1735 CODE:
1514{ 1736{
1515 need_texid (self, texid); 1737 need_texid (self, texid);
1516 1738
1517 { 1739 {
1537 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1761}
1540 1762
1541int 1763int
1542ox (CFPlus::Map self) 1764ox (DC::Map self)
1543 ALIAS: 1765 ALIAS:
1544 oy = 1 1766 oy = 1
1545 x = 2 1767 x = 2
1546 y = 3 1768 y = 3
1547 w = 4 1769 w = 4
1558 } 1780 }
1559 OUTPUT: 1781 OUTPUT:
1560 RETVAL 1782 RETVAL
1561 1783
1562void 1784void
1563scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1564 CODE: 1786 CODE:
1565{ 1787{
1566 if (dx > 0) 1788 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1790 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1585 } 1807 }
1586} 1808}
1587 1809
1588SV * 1810SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1812 CODE:
1591{ 1813{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1816 mapcell *cell;
1622 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1623 1845
1624 do 1846 do
1625 { 1847 {
1626 ext = *data++; 1848 ext = *data++;
1627 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1628 1850
1629 if (cmd < 4) 1851 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1632 { 1854 {
1635 } 1857 }
1636 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1639 { 1861 {
1640 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1641 ; // 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);
1642 1866
1643 data += *data + 1; 1867 data += *data + 1;
1644 } 1868 }
1645 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1870 cell->flags = *data++;
1676 } 1900 }
1677 } 1901 }
1678 } 1902 }
1679 } 1903 }
1680 else 1904 else
1681 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1682 } 1906 }
1683} 1907}
1684 OUTPUT: 1908 OUTPUT:
1685 RETVAL 1909 RETVAL
1686 1910
1687SV * 1911SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1913 CODE:
1690{ 1914{
1691 int x1, x; 1915 int x1, x;
1692 int y1, y; 1916 int y1, y;
1693 int z; 1917 int z;
1738} 1962}
1739 OUTPUT: 1963 OUTPUT:
1740 RETVAL 1964 RETVAL
1741 1965
1742void 1966void
1743draw (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)
1744 CODE: 1968 CODE:
1745{ 1969{
1746 int x, y, z; 1970 int x, y, z;
1747 1971
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 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
1750 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)
1751 smooth_key skey; 1975 smooth_key skey;
1752 1976 int pl_x, pl_y;
1977 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1978 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1979 rc_key_t key;
1755 rc_array_t *arr; 1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1756 1983
1757 // thats current max. sorry. 1984 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1760 1987
1815 tileid tile = cell->tile [z]; 2042 tileid tile = cell->tile [z];
1816 2043
1817 if (tile) 2044 if (tile)
1818 { 2045 {
1819 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1820 int px, py; 2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1821 2049
1822 if (key.texname != tex.name) 2050 if (key.texname != tex.name)
1823 { 2051 {
1824 if (!tex.name) 2052 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1826 2054
1827 key.texname = tex.name; 2055 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2056 arr = rc_array (rc, &key);
1829 } 2057 }
1830 2058
1831 px = (x + 1) * T - tex.w; 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
1833 2066
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 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);
1836 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);
1837 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);
1838 2071
1839 if (cell->flags && z == 2) 2072 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 2073 {
1841 // overlays such as the speech bubble, probably more to come 2074 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 2075 if (cell->flags & 1)
1843 { 2076 {
1844 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
1983 } 2216 }
1984 2217
1985 hv_clear (smooth); 2218 hv_clear (smooth);
1986 } 2219 }
1987 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
1988 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
1989 rc_free (rc); 2239 rc_free (rc);
1990 2240
1991 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2019 } 2269 }
2020 } 2270 }
2021} 2271}
2022 2272
2023void 2273void
2024draw_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)
2025 CODE: 2275 CODE:
2026{ 2276{
2027 static float color[16][3] = { 2277 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2081} 2331}
2082 2332
2083void 2333void
2084fow_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)
2085 PPCODE: 2335 PPCODE:
2086{ 2336{
2087 int x, y; 2337 int x, y;
2088 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2098 2348
2099 mx += self->x - 1; 2349 mx += self->x - 1;
2100 my += self->y - 1; 2350 my += self->y - 1;
2101 2351
2102 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103 2353
2104 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2106 { 2356 {
2107 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2162} 2412}
2163 2413
2164SV * 2414SV *
2165get_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)
2166 CODE: 2416 CODE:
2167{ 2417{
2168 int x, y, x1, y1; 2418 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2477 else
2228 *data++ = 0; 2478 *data++ = 0;
2229 } 2479 }
2230 } 2480 }
2231 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 {
2232 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2234 RETVAL = data_sv; 2489 RETVAL = data_sv;
2235} 2490}
2236 OUTPUT: 2491 OUTPUT:
2237 RETVAL 2492 RETVAL
2238 2493
2239void 2494void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2496 PPCODE:
2242{ 2497{
2243 int x, y, z; 2498 int x, y, z;
2244 int w, h; 2499 int w, h;
2245 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;
2246 2511
2247 if (*data++ != 0) 2512 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2249 2514
2250 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2265 { 2530 {
2266 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2267 2532
2268 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2269 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2270 uint8_t flags = *data++; 2540 flags = *data++;
2271 2541
2272 if (flags) 2542 if (flags)
2273 { 2543 {
2274 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2550
2281 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2282 { 2552 {
2283 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2284 2555
2285 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2286 { 2557 {
2287 tileid t = tile [z]; 2558 tileid t = tile [z];
2288 2559
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2561 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2563 need_texid (self, t);
2293 } 2564 }
2294 2565
2295 cell->tile [z] = t; 2566 cell->tile [z] = t;
2296 } 2567 }
2298 } 2569 }
2299 } 2570 }
2300 } 2571 }
2301} 2572}
2302 2573
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2575
2305CFPlus::RW 2576DC::RW
2306new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2307 CODE: 2578 CODE:
2308{ 2579{
2309 STRLEN datalen; 2580 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2584}
2314 OUTPUT: 2585 OUTPUT:
2315 RETVAL 2586 RETVAL
2316 2587
2317CFPlus::RW 2588DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2590 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2591 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2592 OUTPUT:
2322 RETVAL 2593 RETVAL
2323 2594
2324# fails on win32: 2595# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2596# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2597#void
2327#close (CFPlus::RW self) 2598#close (DC::RW self)
2328# CODE: 2599# CODE:
2329# (self->(close)) (self); 2600# (self->(close)) (self);
2330 2601
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2603
2333PROTOTYPES: DISABLE 2604PROTOTYPES: DISABLE
2334 2605
2335CFPlus::Channel 2606DC::Channel
2336find () 2607find ()
2337 CODE: 2608 CODE:
2338{ 2609{
2339 RETVAL = Mix_GroupAvailable (-1); 2610 RETVAL = Mix_GroupAvailable (-1);
2340 2611
2353} 2624}
2354 OUTPUT: 2625 OUTPUT:
2355 RETVAL 2626 RETVAL
2356 2627
2357void 2628void
2358halt (CFPlus::Channel self) 2629halt (DC::Channel self)
2359 CODE: 2630 CODE:
2360 Mix_HaltChannel (self); 2631 Mix_HaltChannel (self);
2361 2632
2362void 2633void
2363expire (CFPlus::Channel self, int ticks = -1) 2634expire (DC::Channel self, int ticks = -1)
2364 CODE: 2635 CODE:
2365 Mix_ExpireChannel (self, ticks); 2636 Mix_ExpireChannel (self, ticks);
2366 2637
2367void 2638void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2639fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2640 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2641 Mix_FadeOutChannel (self, ticks);
2371 2642
2372int 2643int
2373volume (CFPlus::Channel self, int volume) 2644volume (DC::Channel self, int volume)
2374 CODE: 2645 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2647 OUTPUT:
2377 RETVAL 2648 RETVAL
2378 2649
2379void 2650void
2380unregister_all_effects (CFPlus::Channel self) 2651unregister_all_effects (DC::Channel self)
2381 CODE: 2652 CODE:
2382 Mix_UnregisterAllEffects (self); 2653 Mix_UnregisterAllEffects (self);
2383 2654
2384void 2655void
2385set_panning (CFPlus::Channel self, int left, int right) 2656set_panning (DC::Channel self, int left, int right)
2386 CODE: 2657 CODE:
2387 left = CLAMP (left , 0, 255); 2658 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2659 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2660 Mix_SetPanning (self, left, right);
2390 2661
2391void 2662void
2392set_distance (CFPlus::Channel self, int distance) 2663set_distance (DC::Channel self, int distance)
2393 CODE: 2664 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2666
2396void 2667void
2397set_position (CFPlus::Channel self, int angle, int distance) 2668set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2669 CODE:
2399 2670
2400void 2671void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2673 CODE:
2403{ 2674{
2404 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));
2405 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);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2678}
2408 2679
2409void 2680void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2681set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2682 CODE:
2412 Mix_SetReverseStereo (self, flip); 2683 Mix_SetReverseStereo (self, flip);
2413 2684
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2686
2416PROTOTYPES: DISABLE 2687PROTOTYPES: DISABLE
2417 2688
2418CFPlus::MixChunk 2689DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2690new (SV *class, DC::RW rwops)
2420 CODE: 2691 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2693 OUTPUT:
2423 RETVAL 2694 RETVAL
2424 2695
2425void 2696void
2426DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2427 CODE: 2698 CODE:
2428 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2429 2700
2430int 2701int
2431volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2703 CODE:
2433 if (items > 1) 2704 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2705 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2707 OUTPUT:
2437 RETVAL 2708 RETVAL
2438 2709
2439CFPlus::Channel 2710DC::Channel
2440play (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)
2441 CODE: 2712 CODE:
2442{ 2713{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2715
2445 if (RETVAL < 0) 2716 if (RETVAL < 0)
2452 } 2723 }
2453} 2724}
2454 OUTPUT: 2725 OUTPUT:
2455 RETVAL 2726 RETVAL
2456 2727
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2729
2459int 2730int
2460volume (int volume = -1) 2731volume (int volume = -1)
2461 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2462 CODE: 2733 CODE:
2474void 2745void
2475halt () 2746halt ()
2476 CODE: 2747 CODE:
2477 Mix_HaltMusic (); 2748 Mix_HaltMusic ();
2478 2749
2479CFPlus::MixMusic 2750DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2751new (SV *class, DC::RW rwops)
2481 CODE: 2752 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2754 OUTPUT:
2484 RETVAL 2755 RETVAL
2485 2756
2486void 2757void
2487DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2488 CODE: 2759 CODE:
2489 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2490 2761
2491int 2762int
2492play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2493 CODE: 2764 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2766 OUTPUT:
2496 RETVAL 2767 RETVAL
2497 2768
2498void 2769void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2771 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2773
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2775
2505PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2506 2777
2507BOOT: 2778BOOT:
2508{ 2779{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2781 static const struct {
2511 const char *name; 2782 const char *name;
2512 IV iv; 2783 IV iv;
2513 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2549 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2824 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2825 const_iv (GL_COMPRESSED_ALPHA_ARB),
2826 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2827 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2829 const_iv (GL_COMPRESSED_RGB_ARB),
2830 const_iv (GL_COMPRESSED_RGBA_ARB),
2554 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 2832 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 2833 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 2875 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 2876 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 2881 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 2882 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
2614 2892
2615 texture_av = newAV (); 2893 texture_av = newAV ();
2616 AvREAL_off (texture_av); 2894 AvREAL_off (texture_av);
2617} 2895}
2618 2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
2902
2619char * 2903char *
2620gl_vendor () 2904gl_vendor ()
2621 CODE: 2905 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 2907 OUTPUT:
2744 3028
2745void glRect (float x1, float y1, float x2, float y2) 3029void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3030 CODE:
2747 glRectf (x1, y1, x2, y2); 3031 glRectf (x1, y1, x2, y2);
2748 3032
3033void glRect_lineloop (float x1, float y1, float x2, float y2)
3034 CODE:
3035 glBegin (GL_LINE_LOOP);
3036 glVertex2f (x1, y1);
3037 glVertex2f (x2, y1);
3038 glVertex2f (x2, y2);
3039 glVertex2f (x1, y2);
3040 glEnd ();
3041
2749PROTOTYPES: ENABLE 3042PROTOTYPES: ENABLE
2750 3043
2751void glBegin (int mode) 3044void glBegin (int mode)
2752 3045
2753void glEnd () 3046void glEnd ()
2785void 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)
2786 CODE: 3079 CODE:
2787 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3082
2790void 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)
2791 3084
2792void 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)
2793 3086
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3088
2821 3114
2822void glEndList () 3115void glEndList ()
2823 3116
2824void glCallList (int list) 3117void glCallList (int list)
2825 3118
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3120
2828PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2829 3122
2830void 3123void
2831find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3128 XPUSHs (self);
2836} 3129}
2837 3130
2838BOOT: 3131BOOT:
2839{ 3132{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3134
2842 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);
2843 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);
2844 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);
2845 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);
2846} 3139}
2847 3140
2848void 3141void
2849draw (SV *self) 3142draw (SV *self)
2850 CODE: 3143 CODE:
2854 NV x, y, w, h; 3147 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv); 3148 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv); 3149 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2859 SV *hover;
2860 double draw_x, draw_y, draw_w, draw_h; 3152 double draw_x, draw_y;
2861 3153
2862 if (!SvROK (self)) 3154 if (!SvROK (self))
2863 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864 3156
2865 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2866 3158
2867 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2868 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869 3161
2870 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.;
2871 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.;
2872 3164
2873 if (!h || !w) 3165 if (!h || !w)
2893 { 3185 {
2894 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895 3187
2896 if (svp && SvTRUE (*svp)) 3188 if (svp && SvTRUE (*svp))
2897 { 3189 {
2898 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3190 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2899 glEnable (GL_BLEND); 3191 glEnable (GL_BLEND);
2900 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901 glBegin (GL_QUADS); 3193 glBegin (GL_QUADS);
2902 glVertex2f (0, 0); 3194 glVertex2f (0, 0);
2903 glVertex2f (w, 0); 3195 glVertex2f (w, 0);
2906 glEnd (); 3198 glEnd ();
2907 glDisable (GL_BLEND); 3199 glDisable (GL_BLEND);
2908 } 3200 }
2909 } 3201 }
2910#if 0 3202#if 0
2911 if ($ENV{CFPLUS_DEBUG} & 1) { 3203 // draw borders, for debugging
2912 glPushMatrix; 3204 glPushMatrix ();
2913 glColor 1, 1, 0, 1; 3205 glColor4f (1., 1., 0., 1.);
2914 glTranslate 0.375, 0.375; 3206 glTranslatef (.5, .5, 0.);
2915 glBegin GL_LINE_LOOP; 3207 glBegin (GL_LINE_LOOP);
2916 glVertex 0 , 0; 3208 glVertex2f (0 , 0);
2917 glVertex $self->{w} - 1, 0; 3209 glVertex2f (w - 1, 0);
2918 glVertex $self->{w} - 1, $self->{h} - 1; 3210 glVertex2f (w - 1, h - 1);
2919 glVertex 0 , $self->{h} - 1; 3211 glVertex2f (0 , h - 1);
2920 glEnd; 3212 glEnd ();
2921 glPopMatrix; 3213 glPopMatrix ();
2922 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923 }
2924#endif 3214#endif
2925 PUSHMARK (SP); 3215 PUSHMARK (SP);
2926 XPUSHs (self); 3216 XPUSHs (self);
2927 PUTBACK; 3217 PUTBACK;
2928 call_method ("_draw", G_VOID | G_DISCARD); 3218 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines