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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
493 587
494PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
495 589
496BOOT: 590BOOT:
497{ 591{
498 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 593 static const struct {
500 const char *name; 594 const char *name;
501 IV iv; 595 IV iv;
502 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
525 619
526 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
529 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
611# undef const_iv 790# undef const_iv
612 }; 791 };
613 792
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 812
634NV floor (NV x) 813NV floor (NV x)
635 814
636NV ceil (NV x) 815NV ceil (NV x)
637 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
638void 821void
639pango_init () 822pango_init ()
640 CODE: 823 CODE:
641{ 824{
642 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
645} 833}
646 834
647char *
648SDL_GetError () 835char *SDL_GetError ()
649 836
650int 837void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 838
653void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
654SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
655 855
656void 856void
657SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
658 PPCODE: 858 PPCODE:
659{ 859{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 874
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 877
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 879
683 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
684 while (*m) 881 while (*m)
685 { 882 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 884 {
688 AV *av = newAV (); 885 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
715 912
716 if (RETVAL) 913 if (RETVAL)
717 { 914 {
718 av_clear (texture_av); 915 av_clear (texture_av);
719 916
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 919#include "glfunc.h"
723#undef GL_FUNC 920#undef GL_FUNC
724 } 921 }
725} 922}
732char * 929char *
733SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
734 931
735int 932int
736SDL_GetAppState () 933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
737 937
738void 938void
739poll_events () 939poll_events ()
740 PPCODE: 940 PPCODE:
741{ 941{
751 { 951 {
752 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
753 case SDL_KEYUP: 953 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 959 break;
760 960
761 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 980 x = ev.motion.x;
781 y = ev.motion.y; 981 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 983 }
784 984
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 991 }
792 break; 992 break;
793 993
794 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 997
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1008 break;
809 } 1009 }
810 1010
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1012 }
813} 1013}
814 1014
815int 1015int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1017 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
1020
1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
820 1036
821void 1037void
822Mix_CloseAudio () 1038Mix_CloseAudio ()
823 1039
824int 1040int
859 } 1075 }
860 } 1076 }
861#endif 1077#endif
862} 1078}
863 1079
864void 1080int
865add_font (char *file) 1081add_font (char *file)
866 CODE: 1082 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
868 1086
869void 1087void
870load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
871 ALIAS: 1089 ALIAS:
872 load_image_file = 1 1090 load_image_file = 1
958void 1176void
959error (char *message) 1177error (char *message)
960 CODE: 1178 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1180#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1182#endif
965 1183
966void 1184void
967fatal (char *message) 1185fatal (char *message)
968 CODE: 1186 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1188#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1190#endif
973 _exit (1); 1191 _exit (1);
974 1192
975void 1193void
976_exit (int retval = 0) 1194_exit (int retval = 0)
988#if DEBUG 1206#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
990#endif 1208#endif
991} 1209}
992 1210
993MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
994 1212
995PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
996 1214
997CFPlus::Font 1215DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1217 CODE:
1000{ 1218{
1001 int count; 1219 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1223}
1006 OUTPUT: 1224 OUTPUT:
1007 RETVAL 1225 RETVAL
1008 1226
1009void 1227void
1010DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
1011 CODE: 1229 CODE:
1012 pango_font_description_free (self); 1230 pango_font_description_free (self);
1013 1231
1014void 1232void
1015make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1016 PROTOTYPE: $ 1234 PROTOTYPE: $
1017 CODE: 1235 CODE:
1018 default_font = self; 1236 default_font = self;
1019 1237
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1239
1022PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1023 1241
1024void 1242void
1025reset_glyph_cache () 1243glyph_cache_backup ()
1026 PROTOTYPE: 1244 PROTOTYPE:
1027 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1028 tc_clear (); 1252 tc_restore ();
1029 1253
1030CFPlus::Layout 1254DC::Layout
1031new (SV *class) 1255new (SV *class)
1032 CODE: 1256 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1034 1258
1035 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1046 OUTPUT: 1270 OUTPUT:
1047 RETVAL 1271 RETVAL
1048 1272
1049void 1273void
1050DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1051 CODE: 1275 CODE:
1052 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1053 rc_free (self->rc); 1277 rc_free (self->rc);
1054 Safefree (self); 1278 Safefree (self);
1055 1279
1056void 1280void
1057set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1058 CODE: 1282 CODE:
1059{ 1283{
1060 STRLEN textlen; 1284 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1062 1286
1063 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1064} 1288}
1065 1289
1066void 1290void
1067set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1068 CODE: 1292 CODE:
1069{ 1293{
1070 STRLEN textlen; 1294 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1072 1296
1073 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1074} 1298}
1075 1299
1076void 1300void
1077set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1078 CODE: 1302 CODE:
1079{ 1303{
1080 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1306 const char *pos = text;
1117 if (attrs) 1341 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1119} 1343}
1120 1344
1121void 1345void
1122get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1123 PPCODE: 1347 PPCODE:
1124{ 1348{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1350
1127 do 1351 do
1128 { 1352 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1354
1131 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1132 { 1356 {
1133 PangoRectangle extents; 1357 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1366
1143 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1144} 1368}
1145 1369
1146int 1370int
1147has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1148 CODE: 1372 CODE:
1149{ 1373{
1150 int lines = 1; 1374 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1152 1376
1157} 1381}
1158 OUTPUT: 1382 OUTPUT:
1159 RETVAL 1383 RETVAL
1160 1384
1161SV * 1385SV *
1162get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1163 CODE: 1387 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1390 OUTPUT:
1167 RETVAL 1391 RETVAL
1168 1392
1169void 1393void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1395 CODE:
1172 self->r = r; 1396 self->r = r;
1173 self->g = g; 1397 self->g = g;
1174 self->b = b; 1398 self->b = b;
1175 self->a = a; 1399 self->a = a;
1176 1400
1177void 1401void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1403 CODE:
1180 if (self->font != font) 1404 if (self->font != font)
1181 { 1405 {
1182 self->font = font; 1406 self->font = font;
1183 layout_update_font (self); 1407 layout_update_font (self);
1184 } 1408 }
1185 1409
1186void 1410void
1187set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1188 CODE: 1412 CODE:
1189 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1190 { 1414 {
1191 self->base_height = base_height; 1415 self->base_height = base_height;
1192 layout_update_font (self); 1416 layout_update_font (self);
1193 } 1417 }
1194 1418
1195void 1419void
1196set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1421 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1423
1200void 1424void
1201set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1202 CODE: 1426 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1428
1205void 1429void
1206set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1207 CODE: 1431 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1433
1210void 1434void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1436 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1218 ); 1442 );
1219 1443
1220void 1444void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1446 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1448
1225void 1449void
1226size (CFPlus::Layout self) 1450size (DC::Layout self)
1227 PPCODE: 1451 PPCODE:
1228{ 1452{
1229 int w, h; 1453 int w, h;
1230 1454
1231 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1236} 1460}
1237 1461
1238int 1462int
1239descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1240 CODE: 1464 CODE:
1241{ 1465{
1242 PangoRectangle rect; 1466 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1246} 1470}
1247 OUTPUT: 1471 OUTPUT:
1248 RETVAL 1472 RETVAL
1249 1473
1250int 1474int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1476 CODE:
1253{ 1477{
1254 int index, trailing; 1478 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1257} 1481}
1258 OUTPUT: 1482 OUTPUT:
1259 RETVAL 1483 RETVAL
1260 1484
1261void 1485void
1262cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1487 PPCODE:
1264{ 1488{
1265 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1491
1268 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1496}
1273 1497
1274void 1498void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1500 PPCODE:
1277{ 1501{
1278 int line, x; 1502 int line, x;
1279 1503
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1507 --line;
1508#endif
1283 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1512}
1287 1513
1288void 1514void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1516 PPCODE:
1291{ 1517{
1292 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1293 int index, trailing; 1519 int index, trailing;
1294 1520
1295 if (line < 0) 1521 if (line < 0)
1296 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1297 1523
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1300 1526
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1528
1303 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1536 }
1311} 1537}
1312 1538
1313void 1539void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1541 CODE:
1316 rc_clear (self->rc); 1542 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1318 self->pl, 1544 self->pl,
1319 self->rc, 1545 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1550 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1551 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1552 pango_layout_context_changed (self->pl);
1327 1553
1328void 1554void
1329draw (CFPlus::Layout self) 1555draw (DC::Layout self)
1330 CODE: 1556 CODE:
1331{ 1557{
1332 glEnable (GL_TEXTURE_2D); 1558 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1560 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1568 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1569 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1570 glDisable (GL_TEXTURE_2D);
1345} 1571}
1346 1572
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1574
1349PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1576
1353void 1577void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1579 CODE:
1356{ 1580{
1433 RETVAL = width > 0; 1657 RETVAL = width > 0;
1434} 1658}
1435 OUTPUT: 1659 OUTPUT:
1436 RETVAL 1660 RETVAL
1437 1661
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1663
1440PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1441 1665
1442CFPlus::Map 1666DC::Map
1443new (SV *class) 1667new (SV *class)
1444 CODE: 1668 CODE:
1445 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1670 RETVAL->x = 0;
1447 RETVAL->y = 0; 1671 RETVAL->y = 0;
1455 RETVAL->row = 0; 1679 RETVAL->row = 0;
1456 OUTPUT: 1680 OUTPUT:
1457 RETVAL 1681 RETVAL
1458 1682
1459void 1683void
1460DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1461 CODE: 1685 CODE:
1462{ 1686{
1463 map_clear (self); 1687 map_clear (self);
1464 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1465 Safefree (self->tex); 1689 Safefree (self->tex);
1466 Safefree (self); 1690 Safefree (self);
1467} 1691}
1468 1692
1469void 1693void
1470resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1695 CODE:
1472 self->w = map_width; 1696 self->w = map_width;
1473 self->h = map_height; 1697 self->h = map_height;
1474 1698
1475void 1699void
1476clear (CFPlus::Map self) 1700clear (DC::Map self)
1477 CODE: 1701 CODE:
1478 map_clear (self); 1702 map_clear (self);
1479 1703
1480void 1704void
1481set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1706 CODE:
1483{ 1707{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1709 need_texid (self, tile);
1486} 1710}
1487 1711
1488void 1712void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1714 CODE:
1491{ 1715{
1492 tileid texid; 1716 tileid texid;
1493 maptex *tex; 1717 maptex *tex;
1494 1718
1507 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1509} 1733}
1510 1734
1511void 1735void
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) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1737 CODE:
1514{ 1738{
1515 need_texid (self, texid); 1739 need_texid (self, texid);
1516 1740
1517 { 1741 {
1537 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1763}
1540 1764
1541int 1765int
1542ox (CFPlus::Map self) 1766ox (DC::Map self)
1543 ALIAS: 1767 ALIAS:
1544 oy = 1 1768 oy = 1
1545 x = 2 1769 x = 2
1546 y = 3 1770 y = 3
1547 w = 4 1771 w = 4
1558 } 1782 }
1559 OUTPUT: 1783 OUTPUT:
1560 RETVAL 1784 RETVAL
1561 1785
1562void 1786void
1563scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1564 CODE: 1788 CODE:
1565{ 1789{
1566 if (dx > 0) 1790 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1792 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1585 } 1809 }
1586} 1810}
1587 1811
1588SV * 1812SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1814 CODE:
1591{ 1815{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1818 mapcell *cell;
1622 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1623 1847
1624 do 1848 do
1625 { 1849 {
1626 ext = *data++; 1850 ext = *data++;
1627 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1628 1852
1629 if (cmd < 4) 1853 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1632 { 1856 {
1635 } 1859 }
1636 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1639 { 1863 {
1640 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1868
1643 data += *data + 1; 1869 data += *data + 1;
1644 } 1870 }
1645 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1872 cell->flags = *data++;
1676 } 1902 }
1677 } 1903 }
1678 } 1904 }
1679 } 1905 }
1680 else 1906 else
1681 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1682 } 1908 }
1683} 1909}
1684 OUTPUT: 1910 OUTPUT:
1685 RETVAL 1911 RETVAL
1686 1912
1687SV * 1913SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1915 CODE:
1690{ 1916{
1691 int x1, x; 1917 int x1, x;
1692 int y1, y; 1918 int y1, y;
1693 int z; 1919 int z;
1738} 1964}
1739 OUTPUT: 1965 OUTPUT:
1740 RETVAL 1966 RETVAL
1741 1967
1742void 1968void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 1970 CODE:
1745{ 1971{
1746 int x, y, z; 1972 int x, y, z;
1747 1973
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1977 smooth_key skey;
1752 1978 int pl_x, pl_y;
1979 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1980 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1981 rc_key_t key;
1755 rc_array_t *arr; 1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1756 1985
1757 // thats current max. sorry. 1986 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1760 1989
1815 tileid tile = cell->tile [z]; 2044 tileid tile = cell->tile [z];
1816 2045
1817 if (tile) 2046 if (tile)
1818 { 2047 {
1819 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1820 int px, py; 2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1821 2051
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1825 { 2053 {
1826 if (!tex.name) 2054 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1828 2056
1829 key.texname = tex.name; 2057 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1831 } 2059 }
1832 2060
1833 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1834 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1835 2068
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840 2073
1841 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1842 { 2075 {
1843 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1844 if (cell->flags & 1) 2077 if (cell->flags & 1)
1845 { 2078 {
1846 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1911 // go through all smoothlevels, lowest to highest, then draw. 2144 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 2145 // this is basically counting sort
1913 { 2146 {
1914 int w, b; 2147 int w, b;
1915 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1916 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1917 { 2152 {
1918 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1919 if (smask) 2154 if (smask)
1920 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
1945 { 2180 {
1946 // this time avoiding texture state changes 2181 // this time avoiding texture state changes
1947 // save gobs of state changes. 2182 // save gobs of state changes.
1948 if (key.texname != tex.name) 2183 if (key.texname != tex.name)
1949 { 2184 {
2185 glEnd ();
1950 key.texname = tex.name; 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951 arr = rc_array (rc, &key); 2187 glBegin (GL_QUADS);
1952 } 2188 }
1953 2189
1954 if (border) 2190 if (border)
1955 { 2191 {
1956 float ox = border * dx; 2192 float ox = border * dx;
1957 2193
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962 } 2198 }
1963 2199
1964 if (corner) 2200 if (corner)
1965 { 2201 {
1966 float ox = corner * dx; 2202 float ox = corner * dx;
1967 2203
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972 } 2208 }
1973 } 2209 }
1974 } 2210 }
1975 } 2211 }
1976 } 2212 }
1977 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1978 } 2218 }
1979 2219
1980 hv_clear (smooth); 2220 hv_clear (smooth);
2221 }
2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
1981 rc_draw (rc); 2237 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2238 }
1984 2239
1985 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
1986 rc_free (rc); 2241 rc_free (rc);
1987 2242
1996 { 2251 {
1997 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
1998 2253
1999 int px = x * T; 2254 int px = x * T;
2000 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
2001 2262
2002 if (cell->stat_hp) 2263 if (cell->stat_hp)
2003 { 2264 {
2004 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
2005 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2016 } 2277 }
2017 } 2278 }
2018} 2279}
2019 2280
2020void 2281void
2021draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022 CODE: 2283 CODE:
2023{ 2284{
2024 static float color[16][3] = { 2285 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2286 { 0.00F, 0.00F, 0.00F },
2026 { 1.00F, 1.00F, 1.00F }, 2287 { 1.00F, 1.00F, 1.00F },
2076 glDisable (GL_BLEND); 2337 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2338 glDisable (GL_TEXTURE_2D);
2078} 2339}
2079 2340
2080void 2341void
2081fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2342fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082 PPCODE: 2343 PPCODE:
2083{ 2344{
2084 int x, y; 2345 int x, y;
2085 int sw1 = sw + 2; 2346 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2347 int sh1 = sh + 2;
2094 SvCUR_set (darkness3_sv, sw34 * sh3); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
2095 2356
2096 mx += self->x - 1; 2357 mx += self->x - 1;
2097 my += self->y - 1; 2358 my += self->y - 1;
2098 2359
2099 memset (darkness1, 255, sw1 * sh1); 2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2100 2361
2101 for (y = 0; y < sh1; y++) 2362 for (y = 0; y < sh1; y++)
2102 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
2103 { 2364 {
2104 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2418 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2419 PUSHs (darkness3_sv);
2159} 2420}
2160 2421
2161SV * 2422SV *
2162get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2423get_rect (DC::Map self, int x0, int y0, int w, int h)
2163 CODE: 2424 CODE:
2164{ 2425{
2165 int x, y, x1, y1; 2426 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2427 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2428 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2224 else 2485 else
2225 *data++ = 0; 2486 *data++ = 0;
2226 } 2487 }
2227 } 2488 }
2228 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
2229 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
2231 RETVAL = data_sv; 2497 RETVAL = data_sv;
2232} 2498}
2233 OUTPUT: 2499 OUTPUT:
2234 RETVAL 2500 RETVAL
2235 2501
2236void 2502void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2504 PPCODE:
2239{ 2505{
2240 int x, y, z; 2506 int x, y, z;
2241 int w, h; 2507 int w, h;
2242 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2243 2519
2244 if (*data++ != 0) 2520 if (*data++ != 0)
2245 return; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2246 2522
2247 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2524 h = *data++ << 8; h |= *data++;
2249 2525
2250 // we need to do this 'cause we don't keep an absolute coord system for rows 2526 // we need to do this 'cause we don't keep an absolute coord system for rows
2262 { 2538 {
2263 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2264 2540
2265 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2266 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2267 uint8_t flags = *data++; 2548 flags = *data++;
2268 2549
2269 if (flags) 2550 if (flags)
2270 { 2551 {
2271 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2558
2278 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2279 { 2560 {
2280 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2281 2563
2282 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2283 { 2565 {
2284 tileid t = tile [z]; 2566 tileid t = tile [z];
2285 2567
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2569 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2571 need_texid (self, t);
2290 } 2572 }
2291 2573
2292 cell->tile [z] = t; 2574 cell->tile [z] = t;
2293 } 2575 }
2295 } 2577 }
2296 } 2578 }
2297 } 2579 }
2298} 2580}
2299 2581
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2582MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2583
2302CFPlus::RW 2584DC::RW
2303new (SV *class, SV *data_sv) 2585new (SV *class, SV *data_sv)
2304 CODE: 2586 CODE:
2305{ 2587{
2306 STRLEN datalen; 2588 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2589 char *data = SvPVbyte (data_sv, datalen);
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2591 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2592}
2311 OUTPUT: 2593 OUTPUT:
2312 RETVAL 2594 RETVAL
2313 2595
2314CFPlus::RW 2596DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2597new_from_file (SV *class, const char *path, const char *mode = "rb")
2316 CODE: 2598 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2599 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2600 OUTPUT:
2319 RETVAL 2601 RETVAL
2320 2602
2321# fails on win32: 2603# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2604# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2605#void
2324#close (CFPlus::RW self) 2606#close (DC::RW self)
2325# CODE: 2607# CODE:
2326# (self->(close)) (self); 2608# (self->(close)) (self);
2327 2609
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2610MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2611
2330PROTOTYPES: DISABLE 2612PROTOTYPES: DISABLE
2331 2613
2332CFPlus::Channel 2614DC::Channel
2333find () 2615find ()
2334 CODE: 2616 CODE:
2335{ 2617{
2336 RETVAL = Mix_GroupAvailable (-1); 2618 RETVAL = Mix_GroupAvailable (-1);
2337 2619
2350} 2632}
2351 OUTPUT: 2633 OUTPUT:
2352 RETVAL 2634 RETVAL
2353 2635
2354void 2636void
2355halt (CFPlus::Channel self) 2637halt (DC::Channel self)
2356 CODE: 2638 CODE:
2357 Mix_HaltChannel (self); 2639 Mix_HaltChannel (self);
2358 2640
2359void 2641void
2360expire (CFPlus::Channel self, int ticks = -1) 2642expire (DC::Channel self, int ticks = -1)
2361 CODE: 2643 CODE:
2362 Mix_ExpireChannel (self, ticks); 2644 Mix_ExpireChannel (self, ticks);
2363 2645
2364void 2646void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2647fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2648 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2649 Mix_FadeOutChannel (self, ticks);
2368 2650
2369int 2651int
2370volume (CFPlus::Channel self, int volume) 2652volume (DC::Channel self, int volume)
2371 CODE: 2653 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2654 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2655 OUTPUT:
2374 RETVAL 2656 RETVAL
2375 2657
2376void 2658void
2377unregister_all_effects (CFPlus::Channel self) 2659unregister_all_effects (DC::Channel self)
2378 CODE: 2660 CODE:
2379 Mix_UnregisterAllEffects (self); 2661 Mix_UnregisterAllEffects (self);
2380 2662
2381void 2663void
2382set_panning (CFPlus::Channel self, int left, int right) 2664set_panning (DC::Channel self, int left, int right)
2383 CODE: 2665 CODE:
2384 left = CLAMP (left , 0, 255); 2666 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2667 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2668 Mix_SetPanning (self, left, right);
2387 2669
2388void 2670void
2389set_distance (CFPlus::Channel self, int distance) 2671set_distance (DC::Channel self, int distance)
2390 CODE: 2672 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2673 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2674
2393void 2675void
2394set_position (CFPlus::Channel self, int angle, int distance) 2676set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2677 CODE:
2396 2678
2397void 2679void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2681 CODE:
2400{ 2682{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2686}
2405 2687
2406void 2688void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2689set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2690 CODE:
2409 Mix_SetReverseStereo (self, flip); 2691 Mix_SetReverseStereo (self, flip);
2410 2692
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2694
2413PROTOTYPES: DISABLE 2695PROTOTYPES: DISABLE
2414 2696
2415CFPlus::MixChunk 2697DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2698new (SV *class, DC::RW rwops)
2417 CODE: 2699 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2700 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2701 OUTPUT:
2420 RETVAL 2702 RETVAL
2421 2703
2422void 2704void
2423DESTROY (CFPlus::MixChunk self) 2705DESTROY (DC::MixChunk self)
2424 CODE: 2706 CODE:
2425 Mix_FreeChunk (self); 2707 Mix_FreeChunk (self);
2426 2708
2427int 2709int
2428volume (CFPlus::MixChunk self, int volume = -1) 2710volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2711 CODE:
2430 if (items > 1) 2712 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2713 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2714 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2715 OUTPUT:
2434 RETVAL 2716 RETVAL
2435 2717
2436CFPlus::Channel 2718DC::Channel
2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2719play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438 CODE: 2720 CODE:
2439{ 2721{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2722 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2723
2442 if (RETVAL < 0) 2724 if (RETVAL < 0)
2449 } 2731 }
2450} 2732}
2451 OUTPUT: 2733 OUTPUT:
2452 RETVAL 2734 RETVAL
2453 2735
2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455 2737
2456int 2738int
2457volume (int volume = -1) 2739volume (int volume = -1)
2458 PROTOTYPE: ;$ 2740 PROTOTYPE: ;$
2459 CODE: 2741 CODE:
2471void 2753void
2472halt () 2754halt ()
2473 CODE: 2755 CODE:
2474 Mix_HaltMusic (); 2756 Mix_HaltMusic ();
2475 2757
2476CFPlus::MixMusic 2758DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 2759new (SV *class, DC::RW rwops)
2478 CODE: 2760 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 2761 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 2762 OUTPUT:
2481 RETVAL 2763 RETVAL
2482 2764
2483void 2765void
2484DESTROY (CFPlus::MixMusic self) 2766DESTROY (DC::MixMusic self)
2485 CODE: 2767 CODE:
2486 Mix_FreeMusic (self); 2768 Mix_FreeMusic (self);
2487 2769
2488int 2770int
2489play (CFPlus::MixMusic self, int loops = -1) 2771play (DC::MixMusic self, int loops = -1)
2490 CODE: 2772 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 2773 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 2774 OUTPUT:
2493 RETVAL 2775 RETVAL
2494 2776
2495void 2777void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2778fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 2779 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 2780 Mix_FadeInMusicPos (self, loops, ms, position);
2499 2781
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2782MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 2783
2502PROTOTYPES: ENABLE 2784PROTOTYPES: ENABLE
2503 2785
2504BOOT: 2786BOOT:
2505{ 2787{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2788 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 2789 static const struct {
2508 const char *name; 2790 const char *name;
2509 IV iv; 2791 IV iv;
2510 } *civ, const_iv[] = { 2792 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 2793# define const_iv(name) { # name, (IV)name }
2546 const_iv (GL_INTENSITY), 2828 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 2829 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 2830 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 2831 const_iv (GL_FLOAT),
2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2832 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2833 const_iv (GL_COMPRESSED_ALPHA_ARB),
2834 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2835 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2836 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2837 const_iv (GL_COMPRESSED_RGB_ARB),
2838 const_iv (GL_COMPRESSED_RGBA_ARB),
2551 const_iv (GL_COMPILE), 2839 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 2840 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 2841 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 2842 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 2843 const_iv (GL_TEXTURE_2D),
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2882 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 2883 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 2884 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 2885 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 2886 const_iv (GL_GENERATE_MIPMAP_HINT),
2887 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 2888 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 2889 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 2890 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 2891 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 2892 const_iv (GL_V3F),
2611 2900
2612 texture_av = newAV (); 2901 texture_av = newAV ();
2613 AvREAL_off (texture_av); 2902 AvREAL_off (texture_av);
2614} 2903}
2615 2904
2905void
2906disable_GL_EXT_blend_func_separate ()
2907 CODE:
2908 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0;
2910
2616char * 2911char *
2617gl_vendor () 2912gl_vendor ()
2618 CODE: 2913 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 2914 RETVAL = (char *)glGetString (GL_VENDOR);
2620 OUTPUT: 2915 OUTPUT:
2712void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2713 CODE: 3008 CODE:
2714 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2715 3010
2716void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
3012 PROTOTYPE: @
2717 ALIAS: 3013 ALIAS:
2718 glColor_premultiply = 1 3014 glColor_premultiply = 1
2719 CODE: 3015 CODE:
2720 if (ix) 3016 if (ix)
2721 { 3017 {
2741 3037
2742void glRect (float x1, float y1, float x2, float y2) 3038void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 3039 CODE:
2744 glRectf (x1, y1, x2, y2); 3040 glRectf (x1, y1, x2, y2);
2745 3041
3042void glRect_lineloop (float x1, float y1, float x2, float y2)
3043 CODE:
3044 glBegin (GL_LINE_LOOP);
3045 glVertex2f (x1, y1);
3046 glVertex2f (x2, y1);
3047 glVertex2f (x2, y2);
3048 glVertex2f (x1, y2);
3049 glEnd ();
3050
2746PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2747 3052
2748void glBegin (int mode) 3053void glBegin (int mode)
2749 3054
2750void glEnd () 3055void glEnd ()
2782void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3087void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783 CODE: 3088 CODE:
2784 if (gl.SeparableFilter2D) 3089 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3090 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 3091
2787void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3092void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788 3093
2789void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3094void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790 3095
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 3096void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 3097
2818 3123
2819void glEndList () 3124void glEndList ()
2820 3125
2821void glCallList (int list) 3126void glCallList (int list)
2822 3127
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824 3129
2825PROTOTYPES: DISABLE 3130PROTOTYPES: DISABLE
2826 3131
2827void 3132void
2828find_widget (SV *self, NV x, NV y) 3133find_widget (SV *self, NV x, NV y)
2832 XPUSHs (self); 3137 XPUSHs (self);
2833} 3138}
2834 3139
2835BOOT: 3140BOOT:
2836{ 3141{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3142 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 3143
2839 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3144 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3145 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3146 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3147 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843} 3148}
2844 3149
2845void 3150void
2846draw (SV *self) 3151draw (SV *self)
2847 CODE: 3152 CODE:
2851 NV x, y, w, h; 3156 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3157 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3158 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3159 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3160 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3161 double draw_x, draw_y;
2858 3162
2859 if (!SvROK (self)) 3163 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3164 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3165
2862 hv = (HV *)SvRV (self); 3166 hv = (HV *)SvRV (self);
2863 3167
2864 if (SvTYPE (hv) != SVt_PVHV) 3168 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3169 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3170
2867 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3171 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3172 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869 3173
2870 if (!h || !w) 3174 if (!h || !w)
2890 { 3194 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3195 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3196
2893 if (svp && SvTRUE (*svp)) 3197 if (svp && SvTRUE (*svp))
2894 { 3198 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3199 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896 glEnable (GL_BLEND); 3200 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3202 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3203 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3204 glVertex2f (w, 0);
2903 glEnd (); 3207 glEnd ();
2904 glDisable (GL_BLEND); 3208 glDisable (GL_BLEND);
2905 } 3209 }
2906 } 3210 }
2907#if 0 3211#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3212 // draw borders, for debugging
2909 glPushMatrix; 3213 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3214 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3215 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3216 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3217 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3218 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3219 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3220 glVertex2f (0 , h - 1);
2917 glEnd; 3221 glEnd ();
2918 glPopMatrix; 3222 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3223#endif
2922 PUSHMARK (SP); 3224 PUSHMARK (SP);
2923 XPUSHs (self); 3225 XPUSHs (self);
2924 PUTBACK; 3226 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD); 3227 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines