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.276 by root, Sat Aug 30 08:04:01 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif
73 97
74static AV *texture_av; 98static AV *texture_av;
75 99
76static struct 100static struct
77{ 101{
120 144
121#include "pango-font.c" 145#include "pango-font.c"
122#include "pango-fontmap.c" 146#include "pango-fontmap.c"
123#include "pango-render.c" 147#include "pango-render.c"
124 148
125typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
129 153
130typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
131 155
132static int 156static int
133shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
134{ 158{
135 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
149 173
150typedef struct cf_layout { 174typedef struct cf_layout {
151 PangoLayout *pl; 175 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
153 int base_height; 177 int base_height;
154 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
155} *CFPlus__Layout; 180} *DC__Layout;
156 181
157static CFPlus__Font default_font; 182static DC__Font default_font;
158static PangoContext *opengl_context; 183static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
160 185
161static void 186static void
162substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
167#endif 192#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 194}
170 195
171static void 196static void
172layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
173{ 198{
174 /* 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
175 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
176 */ 201 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
178 203
179 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 206
182 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
183} 208}
184 209
185static void 210static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 212{
188 PangoRectangle rect; 213 PangoRectangle rect;
189 214
190 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
202 227
203typedef uint16_t tileid; 228typedef uint16_t tileid;
204typedef uint16_t faceid; 229typedef uint16_t faceid;
205 230
206typedef struct { 231typedef struct {
207 int name; 232 GLuint name;
208 int w, h; 233 int w, h;
209 float s, t; 234 float s, t;
210 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
211 tileid smoothtile; 236 tileid smoothtile;
212 uint8_t smoothlevel; 237 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
232 257
233 int32_t rows; 258 int32_t rows;
234 maprow *row; 259 maprow *row;
235} *CFPlus__Map; 260} *DC__Map;
236 261
237static char * 262static char *
238prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
239{ 264{
240 char *p; 265 char *p;
278 self->texs *= 2; 303 self->texs *= 2;
279 } 304 }
280} 305}
281 306
282static maprow * 307static maprow *
283map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
284{ 309{
285 if (0 > y) 310 if (0 > y)
286 { 311 {
287 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
326 351
327 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
328} 353}
329 354
330static mapcell * 355static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
332{ 357{
333 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
334} 359}
335 360
336static void 361static void
337map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
338{ 363{
339 int r; 364 int r;
340 365
341 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
349 self->oy = 0; 374 self->oy = 0;
350 self->row = 0; 375 self->row = 0;
351 self->rows = 0; 376 self->rows = 0;
352} 377}
353 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
354static void 389static void
355map_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)
356{ 391{
357 int x, y; 392 int x, y;
358 maprow *row; 393 maprow *row;
359 mapcell *cell; 394 mapcell *cell;
360 395
372 if (x >= row->c1) 407 if (x >= row->c1)
373 break; 408 break;
374 409
375 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
376 411
377 cell->darkness = 0; 412 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 413 }
382 } 414 }
383} 415}
384 416
385typedef struct { 417typedef struct {
439 n |= n >> 16; 471 n |= n >> 16;
440 472
441 return n + 1; 473 return n + 1;
442} 474}
443 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
444/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
447 490
448/******************************************************************************/ 491/******************************************************************************/
486 return 0; 529 return 0;
487 530
488 return 1; 531 return 1;
489} 532}
490 533
491MODULE = CFPlus PACKAGE = CFPlus 534/* process keyboard modifiers */
535static int
536mod_munge (int mod)
537{
538 mod &= MOD_MASK;
539
540 if (mod & (KMOD_META | KMOD_ALT))
541 mod |= KMOD_LRAM;
542
543 return mod;
544}
545
546static void
547deliantra_main ()
548{
549 char *argv[] = { 0 };
550 call_argv ("::main", G_DISCARD | G_VOID, argv);
551}
552
553#ifdef __MACOSX__
554 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back.
559 */
560 extern C_LINKAGE int
561 main (int argc, char *argv[])
562 {
563 deliantra_main ();
564 }
565
566 #undef main
567
568 extern C_LINKAGE int main (int argc, char *argv[]);
569
570 static void
571 SDL_braino (void)
572 {
573 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv);
575 }
576#else
577 static void
578 SDL_braino (void)
579 {
580 deliantra_main ();
581 }
582#endif
583
584MODULE = Deliantra::Client PACKAGE = DC
492 585
493PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
494 587
495BOOT: 588BOOT:
496{ 589{
497 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 591 static const struct {
499 const char *name; 592 const char *name;
500 IV iv; 593 IV iv;
501 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
524 617
525 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
528 621
622
623 const_iv (SDLK_UNKNOWN),
624 const_iv (SDLK_FIRST),
625 const_iv (SDLK_BACKSPACE),
626 const_iv (SDLK_TAB),
627 const_iv (SDLK_CLEAR),
628 const_iv (SDLK_RETURN),
629 const_iv (SDLK_PAUSE),
630 const_iv (SDLK_ESCAPE),
631 const_iv (SDLK_SPACE),
632 const_iv (SDLK_EXCLAIM),
633 const_iv (SDLK_QUOTEDBL),
634 const_iv (SDLK_HASH),
635 const_iv (SDLK_DOLLAR),
636 const_iv (SDLK_AMPERSAND),
637 const_iv (SDLK_QUOTE),
638 const_iv (SDLK_LEFTPAREN),
639 const_iv (SDLK_RIGHTPAREN),
640 const_iv (SDLK_ASTERISK),
641 const_iv (SDLK_PLUS),
642 const_iv (SDLK_COMMA),
643 const_iv (SDLK_MINUS),
644 const_iv (SDLK_PERIOD),
645 const_iv (SDLK_SLASH),
646 const_iv (SDLK_0),
647 const_iv (SDLK_1),
648 const_iv (SDLK_2),
649 const_iv (SDLK_3),
650 const_iv (SDLK_4),
651 const_iv (SDLK_5),
652 const_iv (SDLK_6),
653 const_iv (SDLK_7),
654 const_iv (SDLK_8),
655 const_iv (SDLK_9),
656 const_iv (SDLK_COLON),
657 const_iv (SDLK_SEMICOLON),
658 const_iv (SDLK_LESS),
659 const_iv (SDLK_EQUALS),
660 const_iv (SDLK_GREATER),
661 const_iv (SDLK_QUESTION),
662 const_iv (SDLK_AT),
663
664 const_iv (SDLK_LEFTBRACKET),
665 const_iv (SDLK_BACKSLASH),
666 const_iv (SDLK_RIGHTBRACKET),
667 const_iv (SDLK_CARET),
668 const_iv (SDLK_UNDERSCORE),
669 const_iv (SDLK_BACKQUOTE),
670 const_iv (SDLK_DELETE),
671
672 const_iv (SDLK_FIRST),
673 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
755
756 const_iv (KMOD_LRAM),
757
758 const_iv (MIX_DEFAULT_FORMAT),
759
760 const_iv (SDL_INIT_TIMER),
761 const_iv (SDL_INIT_AUDIO),
762 const_iv (SDL_INIT_VIDEO),
763 const_iv (SDL_INIT_CDROM),
764 const_iv (SDL_INIT_JOYSTICK),
765 const_iv (SDL_INIT_EVERYTHING),
766 const_iv (SDL_INIT_NOPARACHUTE),
767 const_iv (SDL_INIT_EVENTTHREAD),
768
769 const_iv (SDL_GL_RED_SIZE),
770 const_iv (SDL_GL_GREEN_SIZE),
771 const_iv (SDL_GL_BLUE_SIZE),
772 const_iv (SDL_GL_ALPHA_SIZE),
773 const_iv (SDL_GL_DOUBLEBUFFER),
774 const_iv (SDL_GL_BUFFER_SIZE),
775 const_iv (SDL_GL_DEPTH_SIZE),
776 const_iv (SDL_GL_STENCIL_SIZE),
777 const_iv (SDL_GL_ACCUM_RED_SIZE),
778 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
779 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
780 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
781 const_iv (SDL_GL_STEREO),
782 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
783 const_iv (SDL_GL_MULTISAMPLESAMPLES),
784 const_iv (SDL_GL_ACCELERATED_VISUAL),
785 const_iv (SDL_GL_SWAP_CONTROL),
786
787 const_iv (FOW_DARKNESS)
610# undef const_iv 788# undef const_iv
611 }; 789 };
612 790
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 810
633NV floor (NV x) 811NV floor (NV x)
634 812
635NV ceil (NV x) 813NV ceil (NV x)
636 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
637void 819void
638pango_init () 820pango_init ()
639 CODE: 821 CODE:
640{ 822{
641 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 824 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 825 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
826 /*pango_context_set_font_description (opengl_context, default_font);*/
827#if PANGO_VERSION_CHECK (1, 15, 2)
828 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
829 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
830#endif
644} 831}
645 832
646char *
647SDL_GetError () 833char *SDL_GetError ()
648 834
649int 835void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 836
652void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
653SDL_Quit () 843void SDL_Quit ()
844
845int SDL_GL_SetAttribute (int attr, int value)
846
847int SDL_GL_GetAttribute (int attr)
848 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL))
850 XSRETURN_UNDEF;
851 OUTPUT:
852 RETVAL
654 853
655void 854void
656SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
657 PPCODE: 856 PPCODE:
658{ 857{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 872
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 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); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 875
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 877
682 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
683 while (*m) 879 while (*m)
684 { 880 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 882 {
687 AV *av = newAV (); 883 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
714 910
715 if (RETVAL) 911 if (RETVAL)
716 { 912 {
717 av_clear (texture_av); 913 av_clear (texture_av);
718 914
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 917#include "glfunc.h"
722#undef GL_FUNC 918#undef GL_FUNC
723 } 919 }
724} 920}
731char * 927char *
732SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
733 929
734int 930int
735SDL_GetAppState () 931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
736 935
737void 936void
738poll_events () 937poll_events ()
739 PPCODE: 938 PPCODE:
740{ 939{
750 { 949 {
751 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
752 case SDL_KEYUP: 951 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 954 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 955 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 957 break;
759 958
760 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 978 x = ev.motion.x;
780 y = ev.motion.y; 979 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 981 }
783 982
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 989 }
791 break; 990 break;
792 991
793 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 995
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1006 break;
808 } 1007 }
809 1008
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 1010 }
812} 1011}
813 1012
814int 1013int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1015 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
1018
1019void
1020Mix_QuerySpec ()
1021 PPCODE:
1022{
1023 int freq, channels;
1024 Uint16 format;
1025
1026 if (Mix_QuerySpec (&freq, &format, &channels))
1027 {
1028 EXTEND (SP, 3);
1029 PUSHs (sv_2mortal (newSViv (freq)));
1030 PUSHs (sv_2mortal (newSViv (format)));
1031 PUSHs (sv_2mortal (newSViv (channels)));
1032 }
1033}
819 1034
820void 1035void
821Mix_CloseAudio () 1036Mix_CloseAudio ()
822 1037
823int 1038int
858 } 1073 }
859 } 1074 }
860#endif 1075#endif
861} 1076}
862 1077
863void 1078int
864add_font (char *file) 1079add_font (char *file)
865 CODE: 1080 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
867 1084
868void 1085void
869load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
870 ALIAS: 1087 ALIAS:
871 load_image_file = 1 1088 load_image_file = 1
957void 1174void
958error (char *message) 1175error (char *message)
959 CODE: 1176 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1178#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1180#endif
964 1181
965void 1182void
966fatal (char *message) 1183fatal (char *message)
967 CODE: 1184 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1186#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1188#endif
972 _exit (1); 1189 _exit (1);
973 1190
974void 1191void
975_exit (int retval = 0) 1192_exit (int retval = 0)
987#if DEBUG 1204#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1205 VALGRIND_DO_LEAK_CHECK;
989#endif 1206#endif
990} 1207}
991 1208
992MODULE = CFPlus PACKAGE = CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
993 1210
994PROTOTYPES: DISABLE 1211PROTOTYPES: DISABLE
995 1212
996CFPlus::Font 1213DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1215 CODE:
999{ 1216{
1000 int count; 1217 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1221}
1005 OUTPUT: 1222 OUTPUT:
1006 RETVAL 1223 RETVAL
1007 1224
1008void 1225void
1009DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
1010 CODE: 1227 CODE:
1011 pango_font_description_free (self); 1228 pango_font_description_free (self);
1012 1229
1013void 1230void
1014make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1015 PROTOTYPE: $ 1232 PROTOTYPE: $
1016 CODE: 1233 CODE:
1017 default_font = self; 1234 default_font = self;
1018 1235
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1237
1021PROTOTYPES: DISABLE 1238PROTOTYPES: DISABLE
1022 1239
1023void 1240void
1024reset_glyph_cache () 1241glyph_cache_backup ()
1025 PROTOTYPE: 1242 PROTOTYPE:
1026 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
1027 tc_clear (); 1250 tc_restore ();
1028 1251
1029CFPlus::Layout 1252DC::Layout
1030new (SV *class) 1253new (SV *class)
1031 CODE: 1254 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1033 1256
1034 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1041 1265
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1044 OUTPUT: 1268 OUTPUT:
1045 RETVAL 1269 RETVAL
1046 1270
1047void 1271void
1048DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1049 CODE: 1273 CODE:
1050 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
1051 Safefree (self); 1276 Safefree (self);
1052 1277
1053void 1278void
1054set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1055 CODE: 1280 CODE:
1056{ 1281{
1057 STRLEN textlen; 1282 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1059 1284
1060 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1061} 1286}
1062 1287
1063void 1288void
1064set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1065 CODE: 1290 CODE:
1066{ 1291{
1067 STRLEN textlen; 1292 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1069 1294
1070 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1071} 1296}
1072 1297
1073void 1298void
1074set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1075 CODE: 1300 CODE:
1076{ 1301{
1077 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1304 const char *pos = text;
1114 if (attrs) 1339 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1116} 1341}
1117 1342
1118void 1343void
1119get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1120 PPCODE: 1345 PPCODE:
1121{ 1346{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1348
1124 do 1349 do
1125 { 1350 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1352
1128 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1129 { 1354 {
1130 PangoRectangle extents; 1355 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1364
1140 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1141} 1366}
1142 1367
1143int 1368int
1144has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1145 CODE: 1370 CODE:
1146{ 1371{
1147 int lines = 1; 1372 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1149 1374
1154} 1379}
1155 OUTPUT: 1380 OUTPUT:
1156 RETVAL 1381 RETVAL
1157 1382
1158SV * 1383SV *
1159get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1160 CODE: 1385 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1388 OUTPUT:
1164 RETVAL 1389 RETVAL
1165 1390
1166void 1391void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1392set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1393 CODE:
1169 self->r = r; 1394 self->r = r;
1170 self->g = g; 1395 self->g = g;
1171 self->b = b; 1396 self->b = b;
1172 self->a = a; 1397 self->a = a;
1173 1398
1174void 1399void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1401 CODE:
1177 if (self->font != font) 1402 if (self->font != font)
1178 { 1403 {
1179 self->font = font; 1404 self->font = font;
1180 layout_update_font (self); 1405 layout_update_font (self);
1181 } 1406 }
1182 1407
1183void 1408void
1184set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1185 CODE: 1410 CODE:
1186 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1187 { 1412 {
1188 self->base_height = base_height; 1413 self->base_height = base_height;
1189 layout_update_font (self); 1414 layout_update_font (self);
1190 } 1415 }
1191 1416
1192void 1417void
1193set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1419 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1420 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1421
1197void 1422void
1198set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1199 CODE: 1424 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1426
1202void 1427void
1203set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1204 CODE: 1429 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1431
1207void 1432void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1434 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1215 ); 1440 );
1216 1441
1217void 1442void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1444 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1446
1222void 1447void
1223size (CFPlus::Layout self) 1448size (DC::Layout self)
1224 PPCODE: 1449 PPCODE:
1225{ 1450{
1226 int w, h; 1451 int w, h;
1227 1452
1228 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1233} 1458}
1234 1459
1235int 1460int
1236descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1237 CODE: 1462 CODE:
1238{ 1463{
1239 PangoRectangle rect; 1464 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1243} 1468}
1244 OUTPUT: 1469 OUTPUT:
1245 RETVAL 1470 RETVAL
1246 1471
1247int 1472int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1474 CODE:
1250{ 1475{
1251 int index, trailing; 1476 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1477 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1254} 1479}
1255 OUTPUT: 1480 OUTPUT:
1256 RETVAL 1481 RETVAL
1257 1482
1258void 1483void
1259cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1485 PPCODE:
1261{ 1486{
1262 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1489
1265 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1494}
1270 1495
1271void 1496void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1498 PPCODE:
1274{ 1499{
1275 int line, x; 1500 int line, x;
1276 1501
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1505 --line;
1506#endif
1280 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1510}
1284 1511
1285void 1512void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1514 PPCODE:
1288{ 1515{
1289 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1290 int index, trailing; 1517 int index, trailing;
1291 1518
1292 if (line < 0) 1519 if (line < 0)
1293 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1294 1521
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1297 1524
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1526
1300 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1534 }
1308} 1535}
1309 1536
1310void 1537void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1539 CODE:
1540 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1314 self->pl, 1542 self->pl,
1543 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1317 flags 1546 flags
1318 ); 1547 );
1548 // we assume that context_change actually clears/frees stuff
1549 // and does not do any recomputation...
1550 pango_layout_context_changed (self->pl);
1319 1551
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1552void
1553draw (DC::Layout self)
1554 CODE:
1555{
1556 glEnable (GL_TEXTURE_2D);
1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1558 glEnable (GL_BLEND);
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563
1564 rc_draw (self->rc);
1565
1566 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D);
1569}
1570
1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1572
1322PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1574
1326void 1575void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1577 CODE:
1329{ 1578{
1406 RETVAL = width > 0; 1655 RETVAL = width > 0;
1407} 1656}
1408 OUTPUT: 1657 OUTPUT:
1409 RETVAL 1658 RETVAL
1410 1659
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1661
1413PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1414 1663
1415CFPlus::Map 1664DC::Map
1416new (SV *class) 1665new (SV *class)
1417 CODE: 1666 CODE:
1418 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1668 RETVAL->x = 0;
1420 RETVAL->y = 0; 1669 RETVAL->y = 0;
1428 RETVAL->row = 0; 1677 RETVAL->row = 0;
1429 OUTPUT: 1678 OUTPUT:
1430 RETVAL 1679 RETVAL
1431 1680
1432void 1681void
1433DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1434 CODE: 1683 CODE:
1435{ 1684{
1436 map_clear (self); 1685 map_clear (self);
1437 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1438 Safefree (self->tex); 1687 Safefree (self->tex);
1439 Safefree (self); 1688 Safefree (self);
1440} 1689}
1441 1690
1442void 1691void
1443resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1693 CODE:
1445 self->w = map_width; 1694 self->w = map_width;
1446 self->h = map_height; 1695 self->h = map_height;
1447 1696
1448void 1697void
1449clear (CFPlus::Map self) 1698clear (DC::Map self)
1450 CODE: 1699 CODE:
1451 map_clear (self); 1700 map_clear (self);
1452 1701
1453void 1702void
1454set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1704 CODE:
1456{ 1705{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1707 need_texid (self, tile);
1459} 1708}
1460 1709
1461void 1710void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1712 CODE:
1464{ 1713{
1465 tileid texid; 1714 tileid texid;
1466 maptex *tex; 1715 maptex *tex;
1467 1716
1480 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1482} 1731}
1483 1732
1484void 1733void
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) 1734set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1735 CODE:
1487{ 1736{
1488 need_texid (self, texid); 1737 need_texid (self, texid);
1489 1738
1490 { 1739 {
1510 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1761}
1513 1762
1514int 1763int
1515ox (CFPlus::Map self) 1764ox (DC::Map self)
1516 ALIAS: 1765 ALIAS:
1517 oy = 1 1766 oy = 1
1518 x = 2 1767 x = 2
1519 y = 3 1768 y = 3
1520 w = 4 1769 w = 4
1531 } 1780 }
1532 OUTPUT: 1781 OUTPUT:
1533 RETVAL 1782 RETVAL
1534 1783
1535void 1784void
1536scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1537 CODE: 1786 CODE:
1538{ 1787{
1539 if (dx > 0) 1788 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1790 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1558 } 1807 }
1559} 1808}
1560 1809
1561SV * 1810SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1812 CODE:
1564{ 1813{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1816 mapcell *cell;
1595 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1596 1845
1597 do 1846 do
1598 { 1847 {
1599 ext = *data++; 1848 ext = *data++;
1600 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1601 1850
1602 if (cmd < 4) 1851 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1605 { 1854 {
1608 } 1857 }
1609 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1612 { 1861 {
1613 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1866
1616 data += *data + 1; 1867 data += *data + 1;
1617 } 1868 }
1618 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1870 cell->flags = *data++;
1649 } 1900 }
1650 } 1901 }
1651 } 1902 }
1652 } 1903 }
1653 else 1904 else
1654 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1655 } 1906 }
1656} 1907}
1657 OUTPUT: 1908 OUTPUT:
1658 RETVAL 1909 RETVAL
1659 1910
1660SV * 1911SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1913 CODE:
1663{ 1914{
1664 int x1, x; 1915 int x1, x;
1665 int y1, y; 1916 int y1, y;
1666 int z; 1917 int z;
1711} 1962}
1712 OUTPUT: 1963 OUTPUT:
1713 RETVAL 1964 RETVAL
1714 1965
1715void 1966void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 1968 CODE:
1718{ 1969{
1719 int x, y, z; 1970 int x, y, z;
1720 1971
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1975 smooth_key skey;
1725 1976 int pl_x, pl_y;
1977 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1978 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1979 rc_key_t key;
1728 rc_array_t *arr; 1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1729 1983
1730 // thats current max. sorry. 1984 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1733 1987
1788 tileid tile = cell->tile [z]; 2042 tileid tile = cell->tile [z];
1789 2043
1790 if (tile) 2044 if (tile)
1791 { 2045 {
1792 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1793 int px, py; 2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1794 2049
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2050 if (key.texname != tex.name)
1798 { 2051 {
1799 if (!tex.name) 2052 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1801 2054
1802 key.texname = tex.name; 2055 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2056 arr = rc_array (rc, &key);
1804 } 2057 }
1805 2058
1806 px = (x + 1) * T - tex.w; 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
1808 2066
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 2071
1814 if (cell->flags && z == 2) 2072 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 2073 {
1816 // overlays such as the speech bubble, probably more to come 2074 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 2075 if (cell->flags & 1)
1818 { 2076 {
1819 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
1876 } 2134 }
1877 } 2135 }
1878 } 2136 }
1879 } 2137 }
1880 2138
2139 rc_draw (rc);
2140 rc_clear (rc);
2141
1881 // go through all smoothlevels, lowest to highest, then draw. 2142 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2143 // this is basically counting sort
1883 { 2144 {
1884 int w, b; 2145 int w, b;
1885 2146
2147 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2149 for (w = 0; w < 256 / 32; ++w)
1887 { 2150 {
1888 uint32_t smask = smooth_level [w]; 2151 uint32_t smask = smooth_level [w];
1889 if (smask) 2152 if (smask)
1890 for (b = 0; b < 32; ++b) 2153 for (b = 0; b < 32; ++b)
1915 { 2178 {
1916 // this time avoiding texture state changes 2179 // this time avoiding texture state changes
1917 // save gobs of state changes. 2180 // save gobs of state changes.
1918 if (key.texname != tex.name) 2181 if (key.texname != tex.name)
1919 { 2182 {
2183 glEnd ();
1920 key.texname = tex.name; 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2185 glBegin (GL_QUADS);
1922 } 2186 }
1923 2187
1924 if (border) 2188 if (border)
1925 { 2189 {
1926 float ox = border * dx; 2190 float ox = border * dx;
1927 2191
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2196 }
1933 2197
1934 if (corner) 2198 if (corner)
1935 { 2199 {
1936 float ox = corner * dx; 2200 float ox = corner * dx;
1937 2201
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2206 }
1943 } 2207 }
1944 } 2208 }
1945 } 2209 }
1946 } 2210 }
1947 } 2211 }
2212
2213 glEnd ();
2214 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1;
1948 } 2216 }
1949 2217
1950 hv_clear (smooth); 2218 hv_clear (smooth);
2219 }
2220
2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
2226
2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
1951 rc_draw (rc); 2235 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2236 }
1954 2237
1955 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
1956 rc_free (rc); 2239 rc_free (rc);
1957 2240
1986 } 2269 }
1987 } 2270 }
1988} 2271}
1989 2272
1990void 2273void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992 CODE: 2275 CODE:
1993{ 2276{
1994 static float color[16][3] = { 2277 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1996 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2046 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2048} 2331}
2049 2332
2050void 2333void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2334fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2335 PPCODE:
2053{ 2336{
2054 int x, y; 2337 int x, y;
2055 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2065 2348
2066 mx += self->x - 1; 2349 mx += self->x - 1;
2067 my += self->y - 1; 2350 my += self->y - 1;
2068 2351
2069 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2070 2353
2071 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2073 { 2356 {
2074 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2129} 2412}
2130 2413
2131SV * 2414SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2415get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2416 CODE:
2134{ 2417{
2135 int x, y, x1, y1; 2418 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2477 else
2195 *data++ = 0; 2478 *data++ = 0;
2196 } 2479 }
2197 } 2480 }
2198 2481
2482 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 {
2199 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2201 RETVAL = data_sv; 2489 RETVAL = data_sv;
2202} 2490}
2203 OUTPUT: 2491 OUTPUT:
2204 RETVAL 2492 RETVAL
2205 2493
2206void 2494void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2496 PPCODE:
2209{ 2497{
2210 int x, y, z; 2498 int x, y, z;
2211 int w, h; 2499 int w, h;
2212 int x1, y1; 2500 int x1, y1;
2501 STRLEN len;
2502 uint8_t *data, *end;
2503
2504 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv);
2507 end = data + len + 8;
2508
2509 if (len < 5)
2510 XSRETURN_EMPTY;
2213 2511
2214 if (*data++ != 0) 2512 if (*data++ != 0)
2215 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2216 2514
2217 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
2219 2517
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2518 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2530 {
2233 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2234 2532
2235 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2236 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2237 uint8_t flags = *data++; 2540 flags = *data++;
2238 2541
2239 if (flags) 2542 if (flags)
2240 { 2543 {
2241 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2550
2248 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2249 { 2552 {
2250 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2251 2555
2252 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2253 { 2557 {
2254 tileid t = tile [z]; 2558 tileid t = tile [z];
2255 2559
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2561 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2563 need_texid (self, t);
2260 } 2564 }
2261 2565
2262 cell->tile [z] = t; 2566 cell->tile [z] = t;
2263 } 2567 }
2265 } 2569 }
2266 } 2570 }
2267 } 2571 }
2268} 2572}
2269 2573
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2575
2272CFPlus::RW 2576DC::RW
2273new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2274 CODE: 2578 CODE:
2275{ 2579{
2276 STRLEN datalen; 2580 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2584}
2281 OUTPUT: 2585 OUTPUT:
2282 RETVAL 2586 RETVAL
2283 2587
2284CFPlus::RW 2588DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2590 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2591 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2592 OUTPUT:
2289 RETVAL 2593 RETVAL
2290 2594
2291# fails on win32: 2595# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2596# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2597#void
2294#close (CFPlus::RW self) 2598#close (DC::RW self)
2295# CODE: 2599# CODE:
2296# (self->(close)) (self); 2600# (self->(close)) (self);
2297 2601
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2603
2300PROTOTYPES: DISABLE 2604PROTOTYPES: DISABLE
2301 2605
2302CFPlus::Channel 2606DC::Channel
2303find () 2607find ()
2304 CODE: 2608 CODE:
2305{ 2609{
2306 RETVAL = Mix_GroupAvailable (-1); 2610 RETVAL = Mix_GroupAvailable (-1);
2307 2611
2320} 2624}
2321 OUTPUT: 2625 OUTPUT:
2322 RETVAL 2626 RETVAL
2323 2627
2324void 2628void
2325halt (CFPlus::Channel self) 2629halt (DC::Channel self)
2326 CODE: 2630 CODE:
2327 Mix_HaltChannel (self); 2631 Mix_HaltChannel (self);
2328 2632
2329void 2633void
2330expire (CFPlus::Channel self, int ticks = -1) 2634expire (DC::Channel self, int ticks = -1)
2331 CODE: 2635 CODE:
2332 Mix_ExpireChannel (self, ticks); 2636 Mix_ExpireChannel (self, ticks);
2333 2637
2334void 2638void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2639fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2640 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2641 Mix_FadeOutChannel (self, ticks);
2338 2642
2339int 2643int
2340volume (CFPlus::Channel self, int volume) 2644volume (DC::Channel self, int volume)
2341 CODE: 2645 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2647 OUTPUT:
2344 RETVAL 2648 RETVAL
2345 2649
2346void 2650void
2347unregister_all_effects (CFPlus::Channel self) 2651unregister_all_effects (DC::Channel self)
2348 CODE: 2652 CODE:
2349 Mix_UnregisterAllEffects (self); 2653 Mix_UnregisterAllEffects (self);
2350 2654
2351void 2655void
2352set_panning (CFPlus::Channel self, int left, int right) 2656set_panning (DC::Channel self, int left, int right)
2353 CODE: 2657 CODE:
2354 left = CLAMP (left , 0, 255); 2658 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2659 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2660 Mix_SetPanning (self, left, right);
2357 2661
2358void 2662void
2359set_distance (CFPlus::Channel self, int distance) 2663set_distance (DC::Channel self, int distance)
2360 CODE: 2664 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2666
2363void 2667void
2364set_position (CFPlus::Channel self, int angle, int distance) 2668set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2669 CODE:
2366 2670
2367void 2671void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2673 CODE:
2370{ 2674{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2678}
2375 2679
2376void 2680void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2681set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2682 CODE:
2379 Mix_SetReverseStereo (self, flip); 2683 Mix_SetReverseStereo (self, flip);
2380 2684
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2686
2383PROTOTYPES: DISABLE 2687PROTOTYPES: DISABLE
2384 2688
2385CFPlus::MixChunk 2689DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2690new (SV *class, DC::RW rwops)
2387 CODE: 2691 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2693 OUTPUT:
2390 RETVAL 2694 RETVAL
2391 2695
2392void 2696void
2393DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2394 CODE: 2698 CODE:
2395 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2396 2700
2397int 2701int
2398volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2703 CODE:
2400 if (items > 1) 2704 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2705 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2707 OUTPUT:
2404 RETVAL 2708 RETVAL
2405 2709
2406CFPlus::Channel 2710DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2711play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2712 CODE:
2409{ 2713{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2715
2412 if (RETVAL < 0) 2716 if (RETVAL < 0)
2419 } 2723 }
2420} 2724}
2421 OUTPUT: 2725 OUTPUT:
2422 RETVAL 2726 RETVAL
2423 2727
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425 2729
2426int 2730int
2427volume (int volume = -1) 2731volume (int volume = -1)
2428 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2429 CODE: 2733 CODE:
2441void 2745void
2442halt () 2746halt ()
2443 CODE: 2747 CODE:
2444 Mix_HaltMusic (); 2748 Mix_HaltMusic ();
2445 2749
2446CFPlus::MixMusic 2750DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2751new (SV *class, DC::RW rwops)
2448 CODE: 2752 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2754 OUTPUT:
2451 RETVAL 2755 RETVAL
2452 2756
2453void 2757void
2454DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2455 CODE: 2759 CODE:
2456 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2457 2761
2458int 2762int
2459play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2460 CODE: 2764 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 2766 OUTPUT:
2463 RETVAL 2767 RETVAL
2464 2768
2465void 2769void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 2771 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2469 2773
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 2775
2472PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2473 2777
2474BOOT: 2778BOOT:
2475{ 2779{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 2781 static const struct {
2478 const char *name; 2782 const char *name;
2479 IV iv; 2783 IV iv;
2480 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2516 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2824 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2825 const_iv (GL_COMPRESSED_ALPHA_ARB),
2826 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2827 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2829 const_iv (GL_COMPRESSED_RGB_ARB),
2830 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2832 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2833 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2875 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2876 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2881 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2882 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
2581 2892
2582 texture_av = newAV (); 2893 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2894 AvREAL_off (texture_av);
2584} 2895}
2585 2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
2902
2586char * 2903char *
2587gl_vendor () 2904gl_vendor ()
2588 CODE: 2905 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2907 OUTPUT:
2711 3028
2712void glRect (float x1, float y1, float x2, float y2) 3029void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3030 CODE:
2714 glRectf (x1, y1, x2, y2); 3031 glRectf (x1, y1, x2, y2);
2715 3032
3033void glRect_lineloop (float x1, float y1, float x2, float y2)
3034 CODE:
3035 glBegin (GL_LINE_LOOP);
3036 glVertex2f (x1, y1);
3037 glVertex2f (x2, y1);
3038 glVertex2f (x2, y2);
3039 glVertex2f (x1, y2);
3040 glEnd ();
3041
2716PROTOTYPES: ENABLE 3042PROTOTYPES: ENABLE
2717 3043
2718void glBegin (int mode) 3044void glBegin (int mode)
2719 3045
2720void glEnd () 3046void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 3079 CODE:
2754 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3082
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3083void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 3084
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3085void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 3086
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3088
2788 3114
2789void glEndList () 3115void glEndList ()
2790 3116
2791void glCallList (int list) 3117void glCallList (int list)
2792 3118
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3120
2795PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2796 3122
2797void 3123void
2798find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3128 XPUSHs (self);
2803} 3129}
2804 3130
2805BOOT: 3131BOOT:
2806{ 3132{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3134
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3135 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3136 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3137 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3138 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3139}
2814 3140
2815void 3141void
2816draw (SV *self) 3142draw (SV *self)
2817 CODE: 3143 CODE:
2821 NV x, y, w, h; 3147 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3148 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3149 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3152 double draw_x, draw_y;
2828 3153
2829 if (!SvROK (self)) 3154 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3156
2832 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2833 3158
2834 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3161
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3162 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3163 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3164
2840 if (!h || !w) 3165 if (!h || !w)
2860 { 3185 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3187
2863 if (svp && SvTRUE (*svp)) 3188 if (svp && SvTRUE (*svp))
2864 { 3189 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3190 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3191 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3193 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3194 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3195 glVertex2f (w, 0);
2873 glEnd (); 3198 glEnd ();
2874 glDisable (GL_BLEND); 3199 glDisable (GL_BLEND);
2875 } 3200 }
2876 } 3201 }
2877#if 0 3202#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3203 // draw borders, for debugging
2879 glPushMatrix; 3204 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3205 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3206 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3207 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3208 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3209 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3210 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3211 glVertex2f (0 , h - 1);
2887 glEnd; 3212 glEnd ();
2888 glPopMatrix; 3213 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3214#endif
2892 PUSHMARK (SP); 3215 PUSHMARK (SP);
2893 XPUSHs (self); 3216 XPUSHs (self);
2894 PUTBACK; 3217 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3218 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines