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.226 by root, Sat Aug 11 13:05:58 2007 UTC vs.
Revision 1.278 by root, Wed Sep 3 10:36:25 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, fast 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 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1823 { 2053 {
1824 if (!tex.name) 2054 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1826 2056
1827 key.texname = tex.name; 2057 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1829 } 2059 }
1830 2060
1831 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1833 2068
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 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);
1836 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);
1837 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);
1838 2073
1839 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 2075 {
1841 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 2077 if (cell->flags & 1)
1843 { 2078 {
1844 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1983 } 2218 }
1984 2219
1985 hv_clear (smooth); 2220 hv_clear (smooth);
1986 } 2221 }
1987 2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1988 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
1989 rc_free (rc); 2241 rc_free (rc);
1990 2242
1991 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
2019 } 2271 }
2020 } 2272 }
2021} 2273}
2022 2274
2023void 2275void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025 CODE: 2277 CODE:
2026{ 2278{
2027 static float color[16][3] = { 2279 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2280 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2281 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2331 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2332 glDisable (GL_TEXTURE_2D);
2081} 2333}
2082 2334
2083void 2335void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2336fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2337 PPCODE:
2086{ 2338{
2087 int x, y; 2339 int x, y;
2088 int sw1 = sw + 2; 2340 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2341 int sh1 = sh + 2;
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
2098 2350
2099 mx += self->x - 1; 2351 mx += self->x - 1;
2100 my += self->y - 1; 2352 my += self->y - 1;
2101 2353
2102 memset (darkness1, 255, sw1 * sh1); 2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103 2355
2104 for (y = 0; y < sh1; y++) 2356 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
2106 { 2358 {
2107 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2412 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2413 PUSHs (darkness3_sv);
2162} 2414}
2163 2415
2164SV * 2416SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2417get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2418 CODE:
2167{ 2419{
2168 int x, y, x1, y1; 2420 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2421 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2422 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2479 else
2228 *data++ = 0; 2480 *data++ = 0;
2229 } 2481 }
2230 } 2482 }
2231 2483
2484 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 {
2232 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 }
2490
2234 RETVAL = data_sv; 2491 RETVAL = data_sv;
2235} 2492}
2236 OUTPUT: 2493 OUTPUT:
2237 RETVAL 2494 RETVAL
2238 2495
2239void 2496void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2497set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2498 PPCODE:
2242{ 2499{
2243 int x, y, z; 2500 int x, y, z;
2244 int w, h; 2501 int w, h;
2245 int x1, y1; 2502 int x1, y1;
2503 STRLEN len;
2504 uint8_t *data, *end;
2505
2506 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv);
2509 end = data + len + 8;
2510
2511 if (len < 5)
2512 XSRETURN_EMPTY;
2246 2513
2247 if (*data++ != 0) 2514 if (*data++ != 0)
2248 return; /* version mismatch */ 2515 XSRETURN_EMPTY; /* version mismatch */
2249 2516
2250 w = *data++ << 8; w |= *data++; 2517 w = *data++ << 8; w |= *data++;
2251 h = *data++ << 8; h |= *data++; 2518 h = *data++ << 8; h |= *data++;
2252 2519
2253 // we need to do this 'cause we don't keep an absolute coord system for rows 2520 // we need to do this 'cause we don't keep an absolute coord system for rows
2265 { 2532 {
2266 maprow *row = map_get_row (self, y); 2533 maprow *row = map_get_row (self, y);
2267 2534
2268 for (x = x0; x < x1; x++) 2535 for (x = x0; x < x1; x++)
2269 { 2536 {
2537 uint8_t flags;
2538
2539 if (data + 7 >= end)
2540 XSRETURN_EMPTY;
2541
2270 uint8_t flags = *data++; 2542 flags = *data++;
2271 2543
2272 if (flags) 2544 if (flags)
2273 { 2545 {
2274 mapcell *cell = row_get_cell (row, x); 2546 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2547 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2552
2281 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
2282 { 2554 {
2283 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
2284 2557
2285 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
2286 { 2559 {
2287 tileid t = tile [z]; 2560 tileid t = tile [z];
2288 2561
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2563 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2565 need_texid (self, t);
2293 } 2566 }
2294 2567
2295 cell->tile [z] = t; 2568 cell->tile [z] = t;
2296 } 2569 }
2298 } 2571 }
2299 } 2572 }
2300 } 2573 }
2301} 2574}
2302 2575
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2576MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2577
2305CFPlus::RW 2578DC::RW
2306new (SV *class, SV *data_sv) 2579new (SV *class, SV *data_sv)
2307 CODE: 2580 CODE:
2308{ 2581{
2309 STRLEN datalen; 2582 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2583 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2585 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2586}
2314 OUTPUT: 2587 OUTPUT:
2315 RETVAL 2588 RETVAL
2316 2589
2317CFPlus::RW 2590DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2591new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2592 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2593 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2594 OUTPUT:
2322 RETVAL 2595 RETVAL
2323 2596
2324# fails on win32: 2597# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2598# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2599#void
2327#close (CFPlus::RW self) 2600#close (DC::RW self)
2328# CODE: 2601# CODE:
2329# (self->(close)) (self); 2602# (self->(close)) (self);
2330 2603
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2604MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2605
2333PROTOTYPES: DISABLE 2606PROTOTYPES: DISABLE
2334 2607
2335CFPlus::Channel 2608DC::Channel
2336find () 2609find ()
2337 CODE: 2610 CODE:
2338{ 2611{
2339 RETVAL = Mix_GroupAvailable (-1); 2612 RETVAL = Mix_GroupAvailable (-1);
2340 2613
2353} 2626}
2354 OUTPUT: 2627 OUTPUT:
2355 RETVAL 2628 RETVAL
2356 2629
2357void 2630void
2358halt (CFPlus::Channel self) 2631halt (DC::Channel self)
2359 CODE: 2632 CODE:
2360 Mix_HaltChannel (self); 2633 Mix_HaltChannel (self);
2361 2634
2362void 2635void
2363expire (CFPlus::Channel self, int ticks = -1) 2636expire (DC::Channel self, int ticks = -1)
2364 CODE: 2637 CODE:
2365 Mix_ExpireChannel (self, ticks); 2638 Mix_ExpireChannel (self, ticks);
2366 2639
2367void 2640void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2641fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2642 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2643 Mix_FadeOutChannel (self, ticks);
2371 2644
2372int 2645int
2373volume (CFPlus::Channel self, int volume) 2646volume (DC::Channel self, int volume)
2374 CODE: 2647 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2648 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2649 OUTPUT:
2377 RETVAL 2650 RETVAL
2378 2651
2379void 2652void
2380unregister_all_effects (CFPlus::Channel self) 2653unregister_all_effects (DC::Channel self)
2381 CODE: 2654 CODE:
2382 Mix_UnregisterAllEffects (self); 2655 Mix_UnregisterAllEffects (self);
2383 2656
2384void 2657void
2385set_panning (CFPlus::Channel self, int left, int right) 2658set_panning (DC::Channel self, int left, int right)
2386 CODE: 2659 CODE:
2387 left = CLAMP (left , 0, 255); 2660 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2661 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2662 Mix_SetPanning (self, left, right);
2390 2663
2391void 2664void
2392set_distance (CFPlus::Channel self, int distance) 2665set_distance (DC::Channel self, int distance)
2393 CODE: 2666 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2667 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2668
2396void 2669void
2397set_position (CFPlus::Channel self, int angle, int distance) 2670set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2671 CODE:
2399 2672
2400void 2673void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2675 CODE:
2403{ 2676{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2680}
2408 2681
2409void 2682void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2683set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2684 CODE:
2412 Mix_SetReverseStereo (self, flip); 2685 Mix_SetReverseStereo (self, flip);
2413 2686
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2688
2416PROTOTYPES: DISABLE 2689PROTOTYPES: DISABLE
2417 2690
2418CFPlus::MixChunk 2691DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2692new (SV *class, DC::RW rwops)
2420 CODE: 2693 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2694 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2695 OUTPUT:
2423 RETVAL 2696 RETVAL
2424 2697
2425void 2698void
2426DESTROY (CFPlus::MixChunk self) 2699DESTROY (DC::MixChunk self)
2427 CODE: 2700 CODE:
2428 Mix_FreeChunk (self); 2701 Mix_FreeChunk (self);
2429 2702
2430int 2703int
2431volume (CFPlus::MixChunk self, int volume = -1) 2704volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2705 CODE:
2433 if (items > 1) 2706 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2707 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2708 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2709 OUTPUT:
2437 RETVAL 2710 RETVAL
2438 2711
2439CFPlus::Channel 2712DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2713play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2714 CODE:
2442{ 2715{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2716 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2717
2445 if (RETVAL < 0) 2718 if (RETVAL < 0)
2452 } 2725 }
2453} 2726}
2454 OUTPUT: 2727 OUTPUT:
2455 RETVAL 2728 RETVAL
2456 2729
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2731
2459int 2732int
2460volume (int volume = -1) 2733volume (int volume = -1)
2461 PROTOTYPE: ;$ 2734 PROTOTYPE: ;$
2462 CODE: 2735 CODE:
2474void 2747void
2475halt () 2748halt ()
2476 CODE: 2749 CODE:
2477 Mix_HaltMusic (); 2750 Mix_HaltMusic ();
2478 2751
2479CFPlus::MixMusic 2752DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2753new (SV *class, DC::RW rwops)
2481 CODE: 2754 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2755 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2756 OUTPUT:
2484 RETVAL 2757 RETVAL
2485 2758
2486void 2759void
2487DESTROY (CFPlus::MixMusic self) 2760DESTROY (DC::MixMusic self)
2488 CODE: 2761 CODE:
2489 Mix_FreeMusic (self); 2762 Mix_FreeMusic (self);
2490 2763
2491int 2764int
2492play (CFPlus::MixMusic self, int loops = -1) 2765play (DC::MixMusic self, int loops = -1)
2493 CODE: 2766 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2767 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2768 OUTPUT:
2496 RETVAL 2769 RETVAL
2497 2770
2498void 2771void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2772fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2773 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2774 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2775
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2776MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2777
2505PROTOTYPES: ENABLE 2778PROTOTYPES: ENABLE
2506 2779
2507BOOT: 2780BOOT:
2508{ 2781{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2782 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2783 static const struct {
2511 const char *name; 2784 const char *name;
2512 IV iv; 2785 IV iv;
2513 } *civ, const_iv[] = { 2786 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2787# define const_iv(name) { # name, (IV)name }
2549 const_iv (GL_INTENSITY), 2822 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 2823 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 2824 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 2825 const_iv (GL_FLOAT),
2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2826 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2827 const_iv (GL_COMPRESSED_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2829 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2830 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2831 const_iv (GL_COMPRESSED_RGB_ARB),
2832 const_iv (GL_COMPRESSED_RGBA_ARB),
2554 const_iv (GL_COMPILE), 2833 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 2834 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 2835 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 2836 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 2837 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2876 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 2877 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 2878 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 2879 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 2880 const_iv (GL_GENERATE_MIPMAP_HINT),
2881 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 2882 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 2883 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 2884 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 2885 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 2886 const_iv (GL_V3F),
2614 2894
2615 texture_av = newAV (); 2895 texture_av = newAV ();
2616 AvREAL_off (texture_av); 2896 AvREAL_off (texture_av);
2617} 2897}
2618 2898
2899void
2900disable_GL_EXT_blend_func_separate ()
2901 CODE:
2902 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0;
2904
2619char * 2905char *
2620gl_vendor () 2906gl_vendor ()
2621 CODE: 2907 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 2908 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 2909 OUTPUT:
2715void glRotate (float angle, float x, float y, float z) 3001void glRotate (float angle, float x, float y, float z)
2716 CODE: 3002 CODE:
2717 glRotatef (angle, x, y, z); 3003 glRotatef (angle, x, y, z);
2718 3004
2719void glColor (float r, float g, float b, float a = 1.0) 3005void glColor (float r, float g, float b, float a = 1.0)
3006 PROTOTYPE: @
2720 ALIAS: 3007 ALIAS:
2721 glColor_premultiply = 1 3008 glColor_premultiply = 1
2722 CODE: 3009 CODE:
2723 if (ix) 3010 if (ix)
2724 { 3011 {
2744 3031
2745void glRect (float x1, float y1, float x2, float y2) 3032void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3033 CODE:
2747 glRectf (x1, y1, x2, y2); 3034 glRectf (x1, y1, x2, y2);
2748 3035
3036void glRect_lineloop (float x1, float y1, float x2, float y2)
3037 CODE:
3038 glBegin (GL_LINE_LOOP);
3039 glVertex2f (x1, y1);
3040 glVertex2f (x2, y1);
3041 glVertex2f (x2, y2);
3042 glVertex2f (x1, y2);
3043 glEnd ();
3044
2749PROTOTYPES: ENABLE 3045PROTOTYPES: ENABLE
2750 3046
2751void glBegin (int mode) 3047void glBegin (int mode)
2752 3048
2753void glEnd () 3049void glEnd ()
2785void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3081void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786 CODE: 3082 CODE:
2787 if (gl.SeparableFilter2D) 3083 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3084 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3085
2790void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3086void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791 3087
2792void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3088void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793 3089
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3090void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3091
2821 3117
2822void glEndList () 3118void glEndList ()
2823 3119
2824void glCallList (int list) 3120void glCallList (int list)
2825 3121
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3123
2828PROTOTYPES: DISABLE 3124PROTOTYPES: DISABLE
2829 3125
2830void 3126void
2831find_widget (SV *self, NV x, NV y) 3127find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3131 XPUSHs (self);
2836} 3132}
2837 3133
2838BOOT: 3134BOOT:
2839{ 3135{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3136 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3137
2842 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3138 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); 3139 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); 3140 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); 3141 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846} 3142}
2847 3143
2848void 3144void
2849draw (SV *self) 3145draw (SV *self)
2850 CODE: 3146 CODE:
2854 NV x, y, w, h; 3150 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv); 3151 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv); 3152 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3153 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3154 SV *draw_h_sv = GvSV (draw_h_gv);
2859 SV *hover;
2860 double draw_x, draw_y, draw_w, draw_h; 3155 double draw_x, draw_y;
2861 3156
2862 if (!SvROK (self)) 3157 if (!SvROK (self))
2863 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3158 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864 3159
2865 hv = (HV *)SvRV (self); 3160 hv = (HV *)SvRV (self);
2866 3161
2867 if (SvTYPE (hv) != SVt_PVHV) 3162 if (SvTYPE (hv) != SVt_PVHV)
2868 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3163 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869 3164
2870 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3165 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.; 3166 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2872 3167
2873 if (!h || !w) 3168 if (!h || !w)
2893 { 3188 {
2894 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3189 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895 3190
2896 if (svp && SvTRUE (*svp)) 3191 if (svp && SvTRUE (*svp))
2897 { 3192 {
2898 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3193 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2899 glEnable (GL_BLEND); 3194 glEnable (GL_BLEND);
2900 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3195 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901 glBegin (GL_QUADS); 3196 glBegin (GL_QUADS);
2902 glVertex2f (0, 0); 3197 glVertex2f (0, 0);
2903 glVertex2f (w, 0); 3198 glVertex2f (w, 0);
2906 glEnd (); 3201 glEnd ();
2907 glDisable (GL_BLEND); 3202 glDisable (GL_BLEND);
2908 } 3203 }
2909 } 3204 }
2910#if 0 3205#if 0
2911 if ($ENV{CFPLUS_DEBUG} & 1) { 3206 // draw borders, for debugging
2912 glPushMatrix; 3207 glPushMatrix ();
2913 glColor 1, 1, 0, 1; 3208 glColor4f (1., 1., 0., 1.);
2914 glTranslate 0.375, 0.375; 3209 glTranslatef (.5, .5, 0.);
2915 glBegin GL_LINE_LOOP; 3210 glBegin (GL_LINE_LOOP);
2916 glVertex 0 , 0; 3211 glVertex2f (0 , 0);
2917 glVertex $self->{w} - 1, 0; 3212 glVertex2f (w - 1, 0);
2918 glVertex $self->{w} - 1, $self->{h} - 1; 3213 glVertex2f (w - 1, h - 1);
2919 glVertex 0 , $self->{h} - 1; 3214 glVertex2f (0 , h - 1);
2920 glEnd; 3215 glEnd ();
2921 glPopMatrix; 3216 glPopMatrix ();
2922 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923 }
2924#endif 3217#endif
2925 PUSHMARK (SP); 3218 PUSHMARK (SP);
2926 XPUSHs (self); 3219 XPUSHs (self);
2927 PUTBACK; 3220 PUTBACK;
2928 call_method ("_draw", G_VOID | G_DISCARD); 3221 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines