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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 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
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
155} *CFPlus__Layout; 178} *DC__Layout;
156 179
157static CFPlus__Font default_font; 180static DC__Font default_font;
158static PangoContext *opengl_context; 181static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
160 183
161static void 184static void
162substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
167#endif 190#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 192}
170 193
171static void 194static void
172layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
173{ 196{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
176 */ 199 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
178 201
179 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 204
182 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
183} 206}
184 207
185static void 208static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 210{
188 PangoRectangle rect; 211 PangoRectangle rect;
189 212
190 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
202 225
203typedef uint16_t tileid; 226typedef uint16_t tileid;
204typedef uint16_t faceid; 227typedef uint16_t faceid;
205 228
206typedef struct { 229typedef struct {
207 int name; 230 GLuint name;
208 int w, h; 231 int w, h;
209 float s, t; 232 float s, t;
210 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
211 tileid smoothtile; 234 tileid smoothtile;
212 uint8_t smoothlevel; 235 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
232 255
233 int32_t rows; 256 int32_t rows;
234 maprow *row; 257 maprow *row;
235} *CFPlus__Map; 258} *DC__Map;
236 259
237static char * 260static char *
238prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
239{ 262{
240 char *p; 263 char *p;
278 self->texs *= 2; 301 self->texs *= 2;
279 } 302 }
280} 303}
281 304
282static maprow * 305static maprow *
283map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
284{ 307{
285 if (0 > y) 308 if (0 > y)
286 { 309 {
287 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
326 349
327 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
328} 351}
329 352
330static mapcell * 353static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
332{ 355{
333 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
334} 357}
335 358
336static void 359static void
337map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
338{ 361{
339 int r; 362 int r;
340 363
341 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
349 self->oy = 0; 372 self->oy = 0;
350 self->row = 0; 373 self->row = 0;
351 self->rows = 0; 374 self->rows = 0;
352} 375}
353 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
354static void 387static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 389{
357 int x, y; 390 int x, y;
358 maprow *row; 391 maprow *row;
359 mapcell *cell; 392 mapcell *cell;
360 393
372 if (x >= row->c1) 405 if (x >= row->c1)
373 break; 406 break;
374 407
375 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
376 409
377 cell->darkness = 0; 410 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 411 }
382 } 412 }
383} 413}
384 414
385typedef struct { 415typedef struct {
439 n |= n >> 16; 469 n |= n >> 16;
440 470
441 return n + 1; 471 return n + 1;
442} 472}
443 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
444/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
447 488
448/******************************************************************************/ 489/******************************************************************************/
486 return 0; 527 return 0;
487 528
488 return 1; 529 return 1;
489} 530}
490 531
491MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
492 571
493PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
494 573
495BOOT: 574BOOT:
496{ 575{
497 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 577 static const struct {
499 const char *name; 578 const char *name;
500 IV iv; 579 IV iv;
501 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
524 603
525 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
528 607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
657
658 const_iv (SDLK_FIRST),
659 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
741
742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
610# undef const_iv 772# undef const_iv
611 }; 773 };
612 774
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 794
633NV floor (NV x) 795NV floor (NV x)
634 796
635NV ceil (NV x) 797NV ceil (NV x)
636 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
637void 803void
638pango_init () 804pango_init ()
639 CODE: 805 CODE:
640{ 806{
641 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
644} 815}
645 816
646char *
647SDL_GetError () 817char *SDL_GetError ()
648 818
649int 819void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 820
652void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
653SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
654 837
655void 838void
656SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
657 PPCODE: 840 PPCODE:
658{ 841{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 856
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 859
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 861
682 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
683 while (*m) 863 while (*m)
684 { 864 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 866 {
687 AV *av = newAV (); 867 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
714 894
715 if (RETVAL) 895 if (RETVAL)
716 { 896 {
717 av_clear (texture_av); 897 av_clear (texture_av);
718 898
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 901#include "glfunc.h"
722#undef GL_FUNC 902#undef GL_FUNC
723 } 903 }
724} 904}
731char * 911char *
732SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
733 913
734int 914int
735SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
736 919
737void 920void
738poll_events () 921poll_events ()
739 PPCODE: 922 PPCODE:
740{ 923{
750 { 933 {
751 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
752 case SDL_KEYUP: 935 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 941 break;
759 942
760 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 962 x = ev.motion.x;
780 y = ev.motion.y; 963 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 965 }
783 966
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 973 }
791 break; 974 break;
792 975
793 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 979
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 990 break;
808 } 991 }
809 992
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 994 }
812} 995}
813 996
814int 997int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 999 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1001 Mix_ChannelFinished (channel_finished);
1002
1003void
1004Mix_QuerySpec ()
1005 PPCODE:
1006{
1007 int freq, channels;
1008 Uint16 format;
1009
1010 if (Mix_QuerySpec (&freq, &format, &channels))
1011 {
1012 EXTEND (SP, 3);
1013 PUSHs (sv_2mortal (newSViv (freq)));
1014 PUSHs (sv_2mortal (newSViv (format)));
1015 PUSHs (sv_2mortal (newSViv (channels)));
1016 }
1017}
819 1018
820void 1019void
821Mix_CloseAudio () 1020Mix_CloseAudio ()
822 1021
823int 1022int
858 } 1057 }
859 } 1058 }
860#endif 1059#endif
861} 1060}
862 1061
863void 1062int
864add_font (char *file) 1063add_font (char *file)
865 CODE: 1064 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
867 1068
868void 1069void
869load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
870 ALIAS: 1071 ALIAS:
871 load_image_file = 1 1072 load_image_file = 1
957void 1158void
958error (char *message) 1159error (char *message)
959 CODE: 1160 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1162#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1164#endif
964 1165
965void 1166void
966fatal (char *message) 1167fatal (char *message)
967 CODE: 1168 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1170#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1172#endif
972 _exit (1); 1173 _exit (1);
973 1174
974void 1175void
975_exit (int retval = 0) 1176_exit (int retval = 0)
987#if DEBUG 1188#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
989#endif 1190#endif
990} 1191}
991 1192
992MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
993 1194
994PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
995 1196
996CFPlus::Font 1197DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1199 CODE:
999{ 1200{
1000 int count; 1201 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1205}
1005 OUTPUT: 1206 OUTPUT:
1006 RETVAL 1207 RETVAL
1007 1208
1008void 1209void
1009DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
1010 CODE: 1211 CODE:
1011 pango_font_description_free (self); 1212 pango_font_description_free (self);
1012 1213
1013void 1214void
1014make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1015 PROTOTYPE: $ 1216 PROTOTYPE: $
1016 CODE: 1217 CODE:
1017 default_font = self; 1218 default_font = self;
1018 1219
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1221
1021PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1022 1223
1023void 1224void
1024reset_glyph_cache () 1225glyph_cache_backup ()
1025 PROTOTYPE: 1226 PROTOTYPE:
1026 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
1027 tc_clear (); 1234 tc_restore ();
1028 1235
1029CFPlus::Layout 1236DC::Layout
1030new (SV *class) 1237new (SV *class)
1031 CODE: 1238 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1033 1240
1034 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1243 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1244 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1245 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1246 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1247 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1041 1249
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1044 OUTPUT: 1252 OUTPUT:
1045 RETVAL 1253 RETVAL
1046 1254
1047void 1255void
1048DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
1049 CODE: 1257 CODE:
1050 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1259 rc_free (self->rc);
1051 Safefree (self); 1260 Safefree (self);
1052 1261
1053void 1262void
1054set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1055 CODE: 1264 CODE:
1056{ 1265{
1057 STRLEN textlen; 1266 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1059 1268
1060 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1061} 1270}
1062 1271
1063void 1272void
1064set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1065 CODE: 1274 CODE:
1066{ 1275{
1067 STRLEN textlen; 1276 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1069 1278
1070 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1071} 1280}
1072 1281
1073void 1282void
1074set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1075 CODE: 1284 CODE:
1076{ 1285{
1077 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1288 const char *pos = text;
1114 if (attrs) 1323 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1116} 1325}
1117 1326
1118void 1327void
1119get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1120 PPCODE: 1329 PPCODE:
1121{ 1330{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1332
1124 do 1333 do
1125 { 1334 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1336
1128 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1129 { 1338 {
1130 PangoRectangle extents; 1339 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1348
1140 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1141} 1350}
1142 1351
1143int 1352int
1144has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1145 CODE: 1354 CODE:
1146{ 1355{
1147 int lines = 1; 1356 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1149 1358
1154} 1363}
1155 OUTPUT: 1364 OUTPUT:
1156 RETVAL 1365 RETVAL
1157 1366
1158SV * 1367SV *
1159get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1160 CODE: 1369 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1372 OUTPUT:
1164 RETVAL 1373 RETVAL
1165 1374
1166void 1375void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1377 CODE:
1169 self->r = r; 1378 self->r = r;
1170 self->g = g; 1379 self->g = g;
1171 self->b = b; 1380 self->b = b;
1172 self->a = a; 1381 self->a = a;
1173 1382
1174void 1383void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1385 CODE:
1177 if (self->font != font) 1386 if (self->font != font)
1178 { 1387 {
1179 self->font = font; 1388 self->font = font;
1180 layout_update_font (self); 1389 layout_update_font (self);
1181 } 1390 }
1182 1391
1183void 1392void
1184set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1185 CODE: 1394 CODE:
1186 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1187 { 1396 {
1188 self->base_height = base_height; 1397 self->base_height = base_height;
1189 layout_update_font (self); 1398 layout_update_font (self);
1190 } 1399 }
1191 1400
1192void 1401void
1193set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1403 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1405
1197void 1406void
1198set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1199 CODE: 1408 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1410
1202void 1411void
1203set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1204 CODE: 1413 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1415
1207void 1416void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1418 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1215 ); 1424 );
1216 1425
1217void 1426void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1428 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1430
1222void 1431void
1223size (CFPlus::Layout self) 1432size (DC::Layout self)
1224 PPCODE: 1433 PPCODE:
1225{ 1434{
1226 int w, h; 1435 int w, h;
1227 1436
1228 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1233} 1442}
1234 1443
1235int 1444int
1236descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1237 CODE: 1446 CODE:
1238{ 1447{
1239 PangoRectangle rect; 1448 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1243} 1452}
1244 OUTPUT: 1453 OUTPUT:
1245 RETVAL 1454 RETVAL
1246 1455
1247int 1456int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1458 CODE:
1250{ 1459{
1251 int index, trailing; 1460 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1254} 1463}
1255 OUTPUT: 1464 OUTPUT:
1256 RETVAL 1465 RETVAL
1257 1466
1258void 1467void
1259cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1469 PPCODE:
1261{ 1470{
1262 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1473
1265 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1478}
1270 1479
1271void 1480void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1482 PPCODE:
1274{ 1483{
1275 int line, x; 1484 int line, x;
1276 1485
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1489 --line;
1490#endif
1280 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1494}
1284 1495
1285void 1496void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1498 PPCODE:
1288{ 1499{
1289 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1290 int index, trailing; 1501 int index, trailing;
1291 1502
1292 if (line < 0) 1503 if (line < 0)
1293 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1294 1505
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1297 1508
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1510
1300 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1518 }
1308} 1519}
1309 1520
1310void 1521void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1523 CODE:
1524 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1314 self->pl, 1526 self->pl,
1527 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1528 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1529 self->r, self->g, self->b, self->a,
1317 flags 1530 flags
1318 ); 1531 );
1532 // we assume that context_change actually clears/frees stuff
1533 // and does not do any recomputation...
1534 pango_layout_context_changed (self->pl);
1319 1535
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1536void
1537draw (DC::Layout self)
1538 CODE:
1539{
1540 glEnable (GL_TEXTURE_2D);
1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1542 glEnable (GL_BLEND);
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547
1548 rc_draw (self->rc);
1549
1550 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D);
1553}
1554
1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1556
1322PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1558
1326void 1559void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1561 CODE:
1329{ 1562{
1406 RETVAL = width > 0; 1639 RETVAL = width > 0;
1407} 1640}
1408 OUTPUT: 1641 OUTPUT:
1409 RETVAL 1642 RETVAL
1410 1643
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1645
1413PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1414 1647
1415CFPlus::Map 1648DC::Map
1416new (SV *class) 1649new (SV *class)
1417 CODE: 1650 CODE:
1418 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1652 RETVAL->x = 0;
1420 RETVAL->y = 0; 1653 RETVAL->y = 0;
1428 RETVAL->row = 0; 1661 RETVAL->row = 0;
1429 OUTPUT: 1662 OUTPUT:
1430 RETVAL 1663 RETVAL
1431 1664
1432void 1665void
1433DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1434 CODE: 1667 CODE:
1435{ 1668{
1436 map_clear (self); 1669 map_clear (self);
1437 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1438 Safefree (self->tex); 1671 Safefree (self->tex);
1439 Safefree (self); 1672 Safefree (self);
1440} 1673}
1441 1674
1442void 1675void
1443resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1677 CODE:
1445 self->w = map_width; 1678 self->w = map_width;
1446 self->h = map_height; 1679 self->h = map_height;
1447 1680
1448void 1681void
1449clear (CFPlus::Map self) 1682clear (DC::Map self)
1450 CODE: 1683 CODE:
1451 map_clear (self); 1684 map_clear (self);
1452 1685
1453void 1686void
1454set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1688 CODE:
1456{ 1689{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1691 need_texid (self, tile);
1459} 1692}
1460 1693
1461void 1694void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1696 CODE:
1464{ 1697{
1465 tileid texid; 1698 tileid texid;
1466 maptex *tex; 1699 maptex *tex;
1467 1700
1480 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1482} 1715}
1483 1716
1484void 1717void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1719 CODE:
1487{ 1720{
1488 need_texid (self, texid); 1721 need_texid (self, texid);
1489 1722
1490 { 1723 {
1510 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1745}
1513 1746
1514int 1747int
1515ox (CFPlus::Map self) 1748ox (DC::Map self)
1516 ALIAS: 1749 ALIAS:
1517 oy = 1 1750 oy = 1
1518 x = 2 1751 x = 2
1519 y = 3 1752 y = 3
1520 w = 4 1753 w = 4
1531 } 1764 }
1532 OUTPUT: 1765 OUTPUT:
1533 RETVAL 1766 RETVAL
1534 1767
1535void 1768void
1536scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1537 CODE: 1770 CODE:
1538{ 1771{
1539 if (dx > 0) 1772 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1774 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1558 } 1791 }
1559} 1792}
1560 1793
1561SV * 1794SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1796 CODE:
1564{ 1797{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1800 mapcell *cell;
1595 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1596 1829
1597 do 1830 do
1598 { 1831 {
1599 ext = *data++; 1832 ext = *data++;
1600 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1601 1834
1602 if (cmd < 4) 1835 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1605 { 1838 {
1608 } 1841 }
1609 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1612 { 1845 {
1613 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1850
1616 data += *data + 1; 1851 data += *data + 1;
1617 } 1852 }
1618 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1854 cell->flags = *data++;
1649 } 1884 }
1650 } 1885 }
1651 } 1886 }
1652 } 1887 }
1653 else 1888 else
1654 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1655 } 1890 }
1656} 1891}
1657 OUTPUT: 1892 OUTPUT:
1658 RETVAL 1893 RETVAL
1659 1894
1660SV * 1895SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1897 CODE:
1663{ 1898{
1664 int x1, x; 1899 int x1, x;
1665 int y1, y; 1900 int y1, y;
1666 int z; 1901 int z;
1711} 1946}
1712 OUTPUT: 1947 OUTPUT:
1713 RETVAL 1948 RETVAL
1714 1949
1715void 1950void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 1952 CODE:
1718{ 1953{
1719 int x, y, z; 1954 int x, y, z;
1720 1955
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1959 smooth_key skey;
1725 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1963 rc_key_t key;
1728 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1729 1967
1730 // thats current max. sorry. 1968 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1733 1971
1788 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1789 2027
1790 if (tile) 2028 if (tile)
1791 { 2029 {
1792 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1793 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1794 2033
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1798 { 2035 {
1799 if (!tex.name) 2036 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1801 2038
1802 key.texname = tex.name; 2039 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1804 } 2041 }
1805 2042
1806 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1808 2050
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 2055
1814 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 2057 {
1816 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 2059 if (cell->flags & 1)
1818 { 2060 {
1819 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1876 } 2118 }
1877 } 2119 }
1878 } 2120 }
1879 } 2121 }
1880 2122
2123 rc_draw (rc);
2124 rc_clear (rc);
2125
1881 // go through all smoothlevels, lowest to highest, then draw. 2126 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2127 // this is basically counting sort
1883 { 2128 {
1884 int w, b; 2129 int w, b;
1885 2130
2131 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2133 for (w = 0; w < 256 / 32; ++w)
1887 { 2134 {
1888 uint32_t smask = smooth_level [w]; 2135 uint32_t smask = smooth_level [w];
1889 if (smask) 2136 if (smask)
1890 for (b = 0; b < 32; ++b) 2137 for (b = 0; b < 32; ++b)
1915 { 2162 {
1916 // this time avoiding texture state changes 2163 // this time avoiding texture state changes
1917 // save gobs of state changes. 2164 // save gobs of state changes.
1918 if (key.texname != tex.name) 2165 if (key.texname != tex.name)
1919 { 2166 {
2167 glEnd ();
1920 key.texname = tex.name; 2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2169 glBegin (GL_QUADS);
1922 } 2170 }
1923 2171
1924 if (border) 2172 if (border)
1925 { 2173 {
1926 float ox = border * dx; 2174 float ox = border * dx;
1927 2175
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2180 }
1933 2181
1934 if (corner) 2182 if (corner)
1935 { 2183 {
1936 float ox = corner * dx; 2184 float ox = corner * dx;
1937 2185
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2186 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2190 }
1943 } 2191 }
1944 } 2192 }
1945 } 2193 }
1946 } 2194 }
1947 } 2195 }
2196
2197 glEnd ();
2198 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1;
1948 } 2200 }
1949 2201
1950 hv_clear (smooth); 2202 hv_clear (smooth);
2203 }
2204
2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
2210
2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
1951 rc_draw (rc); 2219 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2220 }
1954 2221
1955 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
1956 rc_free (rc); 2223 rc_free (rc);
1957 2224
1986 } 2253 }
1987 } 2254 }
1988} 2255}
1989 2256
1990void 2257void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992 CODE: 2259 CODE:
1993{ 2260{
1994 static float color[16][3] = { 2261 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
1996 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2046 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2048} 2315}
2049 2316
2050void 2317void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2319 PPCODE:
2053{ 2320{
2054 int x, y; 2321 int x, y;
2055 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2065 2332
2066 mx += self->x - 1; 2333 mx += self->x - 1;
2067 my += self->y - 1; 2334 my += self->y - 1;
2068 2335
2069 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2070 2337
2071 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2073 { 2340 {
2074 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2129} 2396}
2130 2397
2131SV * 2398SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2400 CODE:
2134{ 2401{
2135 int x, y, x1, y1; 2402 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2461 else
2195 *data++ = 0; 2462 *data++ = 0;
2196 } 2463 }
2197 } 2464 }
2198 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2199 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2201 RETVAL = data_sv; 2473 RETVAL = data_sv;
2202} 2474}
2203 OUTPUT: 2475 OUTPUT:
2204 RETVAL 2476 RETVAL
2205 2477
2206void 2478void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2480 PPCODE:
2209{ 2481{
2210 int x, y, z; 2482 int x, y, z;
2211 int w, h; 2483 int w, h;
2212 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2213 2495
2214 if (*data++ != 0) 2496 if (*data++ != 0)
2215 return; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2216 2498
2217 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2500 h = *data++ << 8; h |= *data++;
2219 2501
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2502 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2514 {
2233 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2234 2516
2235 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2236 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2237 uint8_t flags = *data++; 2524 flags = *data++;
2238 2525
2239 if (flags) 2526 if (flags)
2240 { 2527 {
2241 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2534
2248 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2249 { 2536 {
2250 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2251 2539
2252 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2253 { 2541 {
2254 tileid t = tile [z]; 2542 tileid t = tile [z];
2255 2543
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2545 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2547 need_texid (self, t);
2260 } 2548 }
2261 2549
2262 cell->tile [z] = t; 2550 cell->tile [z] = t;
2263 } 2551 }
2265 } 2553 }
2266 } 2554 }
2267 } 2555 }
2268} 2556}
2269 2557
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2559
2272CFPlus::RW 2560DC::RW
2273new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2274 CODE: 2562 CODE:
2275{ 2563{
2276 STRLEN datalen; 2564 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2568}
2281 OUTPUT: 2569 OUTPUT:
2282 RETVAL 2570 RETVAL
2283 2571
2284CFPlus::RW 2572DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2574 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2576 OUTPUT:
2289 RETVAL 2577 RETVAL
2290 2578
2291# fails on win32: 2579# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2580# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2581#void
2294#close (CFPlus::RW self) 2582#close (DC::RW self)
2295# CODE: 2583# CODE:
2296# (self->(close)) (self); 2584# (self->(close)) (self);
2297 2585
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2587
2300PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2301 2589
2302CFPlus::Channel 2590DC::Channel
2303find () 2591find ()
2304 CODE: 2592 CODE:
2305{ 2593{
2306 RETVAL = Mix_GroupAvailable (-1); 2594 RETVAL = Mix_GroupAvailable (-1);
2307 2595
2320} 2608}
2321 OUTPUT: 2609 OUTPUT:
2322 RETVAL 2610 RETVAL
2323 2611
2324void 2612void
2325halt (CFPlus::Channel self) 2613halt (DC::Channel self)
2326 CODE: 2614 CODE:
2327 Mix_HaltChannel (self); 2615 Mix_HaltChannel (self);
2328 2616
2329void 2617void
2330expire (CFPlus::Channel self, int ticks = -1) 2618expire (DC::Channel self, int ticks = -1)
2331 CODE: 2619 CODE:
2332 Mix_ExpireChannel (self, ticks); 2620 Mix_ExpireChannel (self, ticks);
2333 2621
2334void 2622void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2623fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2624 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2625 Mix_FadeOutChannel (self, ticks);
2338 2626
2339int 2627int
2340volume (CFPlus::Channel self, int volume) 2628volume (DC::Channel self, int volume)
2341 CODE: 2629 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2631 OUTPUT:
2344 RETVAL 2632 RETVAL
2345 2633
2346void 2634void
2347unregister_all_effects (CFPlus::Channel self) 2635unregister_all_effects (DC::Channel self)
2348 CODE: 2636 CODE:
2349 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2350 2638
2351void 2639void
2352set_panning (CFPlus::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2353 CODE: 2641 CODE:
2354 left = CLAMP (left , 0, 255); 2642 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2643 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2357 2645
2358void 2646void
2359set_distance (CFPlus::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2360 CODE: 2648 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2650
2363void 2651void
2364set_position (CFPlus::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2653 CODE:
2366 2654
2367void 2655void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2657 CODE:
2370{ 2658{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2662}
2375 2663
2376void 2664void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2666 CODE:
2379 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2380 2668
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2670
2383PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2384 2672
2385CFPlus::MixChunk 2673DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2674new (SV *class, DC::RW rwops)
2387 CODE: 2675 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2677 OUTPUT:
2390 RETVAL 2678 RETVAL
2391 2679
2392void 2680void
2393DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2394 CODE: 2682 CODE:
2395 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2396 2684
2397int 2685int
2398volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2687 CODE:
2400 if (items > 1) 2688 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2689 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2691 OUTPUT:
2404 RETVAL 2692 RETVAL
2405 2693
2406CFPlus::Channel 2694DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2696 CODE:
2409{ 2697{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2699
2412 if (RETVAL < 0) 2700 if (RETVAL < 0)
2419 } 2707 }
2420} 2708}
2421 OUTPUT: 2709 OUTPUT:
2422 RETVAL 2710 RETVAL
2423 2711
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425 2713
2426int 2714int
2427volume (int volume = -1) 2715volume (int volume = -1)
2428 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2429 CODE: 2717 CODE:
2441void 2729void
2442halt () 2730halt ()
2443 CODE: 2731 CODE:
2444 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2445 2733
2446CFPlus::MixMusic 2734DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2735new (SV *class, DC::RW rwops)
2448 CODE: 2736 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2738 OUTPUT:
2451 RETVAL 2739 RETVAL
2452 2740
2453void 2741void
2454DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2455 CODE: 2743 CODE:
2456 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2457 2745
2458int 2746int
2459play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2460 CODE: 2748 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 2750 OUTPUT:
2463 RETVAL 2751 RETVAL
2464 2752
2465void 2753void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 2755 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2469 2757
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 2759
2472PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2473 2761
2474BOOT: 2762BOOT:
2475{ 2763{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 2765 static const struct {
2478 const char *name; 2766 const char *name;
2479 IV iv; 2767 IV iv;
2480 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2516 const_iv (GL_INTENSITY), 2804 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2805 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2806 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2807 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2808 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2809 const_iv (GL_COMPRESSED_ALPHA_ARB),
2810 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2811 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2812 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2813 const_iv (GL_COMPRESSED_RGB_ARB),
2814 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2815 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2816 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2817 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2818 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2819 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2858 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2859 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2860 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2861 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2862 const_iv (GL_GENERATE_MIPMAP_HINT),
2863 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2864 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2865 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2866 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2867 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2868 const_iv (GL_V3F),
2581 2876
2582 texture_av = newAV (); 2877 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2878 AvREAL_off (texture_av);
2584} 2879}
2585 2880
2881void
2882disable_GL_EXT_blend_func_separate ()
2883 CODE:
2884 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0;
2886
2586char * 2887char *
2587gl_vendor () 2888gl_vendor ()
2588 CODE: 2889 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2890 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2891 OUTPUT:
2711 3012
2712void glRect (float x1, float y1, float x2, float y2) 3013void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3014 CODE:
2714 glRectf (x1, y1, x2, y2); 3015 glRectf (x1, y1, x2, y2);
2715 3016
3017void glRect_lineloop (float x1, float y1, float x2, float y2)
3018 CODE:
3019 glBegin (GL_LINE_LOOP);
3020 glVertex2f (x1, y1);
3021 glVertex2f (x2, y1);
3022 glVertex2f (x2, y2);
3023 glVertex2f (x1, y2);
3024 glEnd ();
3025
2716PROTOTYPES: ENABLE 3026PROTOTYPES: ENABLE
2717 3027
2718void glBegin (int mode) 3028void glBegin (int mode)
2719 3029
2720void glEnd () 3030void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 3063 CODE:
2754 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3066
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 3068
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 3070
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3072
2788 3098
2789void glEndList () 3099void glEndList ()
2790 3100
2791void glCallList (int list) 3101void glCallList (int list)
2792 3102
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3104
2795PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2796 3106
2797void 3107void
2798find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3112 XPUSHs (self);
2803} 3113}
2804 3114
2805BOOT: 3115BOOT:
2806{ 3116{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3118
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3123}
2814 3124
2815void 3125void
2816draw (SV *self) 3126draw (SV *self)
2817 CODE: 3127 CODE:
2821 NV x, y, w, h; 3131 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3132 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3133 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3136 double draw_x, draw_y;
2828 3137
2829 if (!SvROK (self)) 3138 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3140
2832 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2833 3142
2834 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3145
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3148
2840 if (!h || !w) 3149 if (!h || !w)
2860 { 3169 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3170 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3171
2863 if (svp && SvTRUE (*svp)) 3172 if (svp && SvTRUE (*svp))
2864 { 3173 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3174 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3175 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3176 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3177 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3178 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3179 glVertex2f (w, 0);
2873 glEnd (); 3182 glEnd ();
2874 glDisable (GL_BLEND); 3183 glDisable (GL_BLEND);
2875 } 3184 }
2876 } 3185 }
2877#if 0 3186#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3187 // draw borders, for debugging
2879 glPushMatrix; 3188 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3189 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3190 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3191 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3192 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3193 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3194 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3195 glVertex2f (0 , h - 1);
2887 glEnd; 3196 glEnd ();
2888 glPopMatrix; 3197 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3198#endif
2892 PUSHMARK (SP); 3199 PUSHMARK (SP);
2893 XPUSHs (self); 3200 XPUSHs (self);
2894 PUTBACK; 3201 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3202 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines