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.222 by root, Sat Aug 11 06:34:26 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{
114 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
116} 140}
117 141
118#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
119 144
120#include "pango-font.c" 145#include "pango-font.c"
121#include "pango-fontmap.c" 146#include "pango-fontmap.c"
122#include "pango-render.c" 147#include "pango-render.c"
123 148
124typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
128 153
129typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
130 155
131static int 156static int
132shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
133{ 158{
134 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
148 173
149typedef struct cf_layout { 174typedef struct cf_layout {
150 PangoLayout *pl; 175 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
152 int base_height; 177 int base_height;
153 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
154} *CFPlus__Layout; 180} *DC__Layout;
155 181
156static CFPlus__Font default_font; 182static DC__Font default_font;
157static PangoContext *opengl_context; 183static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
159 185
160static void 186static void
161substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
166#endif 192#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 194}
169 195
170static void 196static void
171layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
172{ 198{
173 /* 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
174 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
175 */ 201 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
177 203
178 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 206
181 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
182} 208}
183 209
184static void 210static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 212{
187 PangoRectangle rect; 213 PangoRectangle rect;
188 214
189 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
201 227
202typedef uint16_t tileid; 228typedef uint16_t tileid;
203typedef uint16_t faceid; 229typedef uint16_t faceid;
204 230
205typedef struct { 231typedef struct {
206 int name; 232 GLuint name;
207 int w, h; 233 int w, h;
208 float s, t; 234 float s, t;
209 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
210 tileid smoothtile; 236 tileid smoothtile;
211 uint8_t smoothlevel; 237 uint8_t smoothlevel;
229 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
231 257
232 int32_t rows; 258 int32_t rows;
233 maprow *row; 259 maprow *row;
234} *CFPlus__Map; 260} *DC__Map;
235 261
236static char * 262static char *
237prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
238{ 264{
239 char *p; 265 char *p;
277 self->texs *= 2; 303 self->texs *= 2;
278 } 304 }
279} 305}
280 306
281static maprow * 307static maprow *
282map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
283{ 309{
284 if (0 > y) 310 if (0 > y)
285 { 311 {
286 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
325 351
326 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
327} 353}
328 354
329static mapcell * 355static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
331{ 357{
332 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
333} 359}
334 360
335static void 361static void
336map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
337{ 363{
338 int r; 364 int r;
339 365
340 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
348 self->oy = 0; 374 self->oy = 0;
349 self->row = 0; 375 self->row = 0;
350 self->rows = 0; 376 self->rows = 0;
351} 377}
352 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
353static void 389static void
354map_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)
355{ 391{
356 int x, y; 392 int x, y;
357 maprow *row; 393 maprow *row;
358 mapcell *cell; 394 mapcell *cell;
359 395
371 if (x >= row->c1) 407 if (x >= row->c1)
372 break; 408 break;
373 409
374 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
375 411
376 cell->darkness = 0; 412 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 413 }
381 } 414 }
382} 415}
383 416
384typedef struct { 417typedef struct {
438 n |= n >> 16; 471 n |= n >> 16;
439 472
440 return n + 1; 473 return n + 1;
441} 474}
442 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
443/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
446 490
447/******************************************************************************/ 491/******************************************************************************/
485 return 0; 529 return 0;
486 530
487 return 1; 531 return 1;
488} 532}
489 533
490MODULE = 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
491 585
492PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
493 587
494BOOT: 588BOOT:
495{ 589{
496 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 591 static const struct {
498 const char *name; 592 const char *name;
499 IV iv; 593 IV iv;
500 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
523 617
524 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
527 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),
528 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
608 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)
609# undef const_iv 788# undef const_iv
610 }; 789 };
611 790
612 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; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 810
632NV floor (NV x) 811NV floor (NV x)
633 812
634NV ceil (NV x) 813NV ceil (NV x)
635 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
636void 819void
637pango_init () 820pango_init ()
638 CODE: 821 CODE:
639{ 822{
640 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 831}
644 832
645char *
646SDL_GetError () 833char *SDL_GetError ()
647 834
648int 835void SDL_braino ()
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650 836
651void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
652SDL_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
653 853
654void 854void
655SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
656 PPCODE: 856 PPCODE:
657{ 857{
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 872
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 875
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 877
681 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
682 while (*m) 879 while (*m)
683 { 880 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 882 {
686 AV *av = newAV (); 883 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
713 910
714 if (RETVAL) 911 if (RETVAL)
715 { 912 {
716 av_clear (texture_av); 913 av_clear (texture_av);
717 914
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#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);
720#include "glfunc.h" 917#include "glfunc.h"
721#undef GL_FUNC 918#undef GL_FUNC
722 } 919 }
723} 920}
730char * 927char *
731SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
732 929
733int 930int
734SDL_GetAppState () 931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
735 935
736void 936void
737poll_events () 937poll_events ()
738 PPCODE: 938 PPCODE:
739{ 939{
749 { 949 {
750 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
751 case SDL_KEYUP: 951 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 957 break;
758 958
759 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 978 x = ev.motion.x;
779 y = ev.motion.y; 979 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 981 }
782 982
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 989 }
790 break; 990 break;
791 991
792 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 995
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1006 break;
807 } 1007 }
808 1008
809 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))));
810 } 1010 }
811} 1011}
812 1012
813int 1013int
814Mix_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)
815 POSTCALL: 1015 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
817 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}
818 1034
819void 1035void
820Mix_CloseAudio () 1036Mix_CloseAudio ()
821 1037
822int 1038int
857 } 1073 }
858 } 1074 }
859#endif 1075#endif
860} 1076}
861 1077
862void 1078int
863add_font (char *file) 1079add_font (char *file)
864 CODE: 1080 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
866 1084
867void 1085void
868load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
869 ALIAS: 1087 ALIAS:
870 load_image_file = 1 1088 load_image_file = 1
956void 1174void
957error (char *message) 1175error (char *message)
958 CODE: 1176 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1178#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1180#endif
963 1181
964void 1182void
965fatal (char *message) 1183fatal (char *message)
966 CODE: 1184 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1186#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1188#endif
971 _exit (1); 1189 _exit (1);
972 1190
973void 1191void
974_exit (int retval = 0) 1192_exit (int retval = 0)
986#if DEBUG 1204#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1205 VALGRIND_DO_LEAK_CHECK;
988#endif 1206#endif
989} 1207}
990 1208
991MODULE = CFPlus PACKAGE = CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
992 1210
993PROTOTYPES: DISABLE 1211PROTOTYPES: DISABLE
994 1212
995CFPlus::Font 1213DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1215 CODE:
998{ 1216{
999 int count; 1217 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1221}
1004 OUTPUT: 1222 OUTPUT:
1005 RETVAL 1223 RETVAL
1006 1224
1007void 1225void
1008DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
1009 CODE: 1227 CODE:
1010 pango_font_description_free (self); 1228 pango_font_description_free (self);
1011 1229
1012void 1230void
1013make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1014 PROTOTYPE: $ 1232 PROTOTYPE: $
1015 CODE: 1233 CODE:
1016 default_font = self; 1234 default_font = self;
1017 1235
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1237
1020PROTOTYPES: DISABLE 1238PROTOTYPES: DISABLE
1021 1239
1022void 1240void
1023reset_glyph_cache () 1241glyph_cache_backup ()
1024 PROTOTYPE: 1242 PROTOTYPE:
1025 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
1026 tc_clear (); 1250 tc_restore ();
1027 1251
1028CFPlus::Layout 1252DC::Layout
1029new (SV *class) 1253new (SV *class)
1030 CODE: 1254 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1032 1256
1033 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1040 1265
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1043 OUTPUT: 1268 OUTPUT:
1044 RETVAL 1269 RETVAL
1045 1270
1046void 1271void
1047DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1048 CODE: 1273 CODE:
1049 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
1050 Safefree (self); 1276 Safefree (self);
1051 1277
1052void 1278void
1053set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1054 CODE: 1280 CODE:
1055{ 1281{
1056 STRLEN textlen; 1282 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1058 1284
1059 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1060} 1286}
1061 1287
1062void 1288void
1063set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1064 CODE: 1290 CODE:
1065{ 1291{
1066 STRLEN textlen; 1292 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1068 1294
1069 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1070} 1296}
1071 1297
1072void 1298void
1073set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1074 CODE: 1300 CODE:
1075{ 1301{
1076 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1304 const char *pos = text;
1113 if (attrs) 1339 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1115} 1341}
1116 1342
1117void 1343void
1118get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1119 PPCODE: 1345 PPCODE:
1120{ 1346{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1348
1123 do 1349 do
1124 { 1350 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1352
1127 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1128 { 1354 {
1129 PangoRectangle extents; 1355 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1364
1139 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1140} 1366}
1141 1367
1142int 1368int
1143has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1144 CODE: 1370 CODE:
1145{ 1371{
1146 int lines = 1; 1372 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1148 1374
1153} 1379}
1154 OUTPUT: 1380 OUTPUT:
1155 RETVAL 1381 RETVAL
1156 1382
1157SV * 1383SV *
1158get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1159 CODE: 1385 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1388 OUTPUT:
1163 RETVAL 1389 RETVAL
1164 1390
1165void 1391void
1166set_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.)
1167 CODE: 1393 CODE:
1168 self->r = r; 1394 self->r = r;
1169 self->g = g; 1395 self->g = g;
1170 self->b = b; 1396 self->b = b;
1171 self->a = a; 1397 self->a = a;
1172 1398
1173void 1399void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1401 CODE:
1176 if (self->font != font) 1402 if (self->font != font)
1177 { 1403 {
1178 self->font = font; 1404 self->font = font;
1179 layout_update_font (self); 1405 layout_update_font (self);
1180 } 1406 }
1181 1407
1182void 1408void
1183set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1184 CODE: 1410 CODE:
1185 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1186 { 1412 {
1187 self->base_height = base_height; 1413 self->base_height = base_height;
1188 layout_update_font (self); 1414 layout_update_font (self);
1189 } 1415 }
1190 1416
1191void 1417void
1192set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1419 CODE:
1194 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);
1195 1421
1196void 1422void
1197set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1198 CODE: 1424 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1426
1201void 1427void
1202set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1203 CODE: 1429 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1431
1206void 1432void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1434 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1214 ); 1440 );
1215 1441
1216void 1442void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1444 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1446
1221void 1447void
1222size (CFPlus::Layout self) 1448size (DC::Layout self)
1223 PPCODE: 1449 PPCODE:
1224{ 1450{
1225 int w, h; 1451 int w, h;
1226 1452
1227 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1232} 1458}
1233 1459
1234int 1460int
1235descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1236 CODE: 1462 CODE:
1237{ 1463{
1238 PangoRectangle rect; 1464 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1242} 1468}
1243 OUTPUT: 1469 OUTPUT:
1244 RETVAL 1470 RETVAL
1245 1471
1246int 1472int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1474 CODE:
1249{ 1475{
1250 int index, trailing; 1476 int index, trailing;
1251 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);
1252 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1253} 1479}
1254 OUTPUT: 1480 OUTPUT:
1255 RETVAL 1481 RETVAL
1256 1482
1257void 1483void
1258cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1485 PPCODE:
1260{ 1486{
1261 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1489
1264 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1494}
1269 1495
1270void 1496void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1498 PPCODE:
1273{ 1499{
1274 int line, x; 1500 int line, x;
1275 1501
1276 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)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1505 --line;
1506#endif
1279 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1510}
1283 1511
1284void 1512void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1514 PPCODE:
1287{ 1515{
1288 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1289 int index, trailing; 1517 int index, trailing;
1290 1518
1291 if (line < 0) 1519 if (line < 0)
1292 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1293 1521
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1296 1524
1297 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);
1298 1526
1299 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1534 }
1307} 1535}
1308 1536
1309void 1537void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1539 CODE:
1540 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1313 self->pl, 1542 self->pl,
1543 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1316 flags 1546 flags
1317 ); 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);
1318 1551
1319MODULE = 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
1320 1572
1321PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1574
1325void 1575void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1577 CODE:
1328{ 1578{
1405 RETVAL = width > 0; 1655 RETVAL = width > 0;
1406} 1656}
1407 OUTPUT: 1657 OUTPUT:
1408 RETVAL 1658 RETVAL
1409 1659
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1661
1412PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1413 1663
1414CFPlus::Map 1664DC::Map
1415new (SV *class) 1665new (SV *class)
1416 CODE: 1666 CODE:
1417 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1668 RETVAL->x = 0;
1419 RETVAL->y = 0; 1669 RETVAL->y = 0;
1427 RETVAL->row = 0; 1677 RETVAL->row = 0;
1428 OUTPUT: 1678 OUTPUT:
1429 RETVAL 1679 RETVAL
1430 1680
1431void 1681void
1432DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1433 CODE: 1683 CODE:
1434{ 1684{
1435 map_clear (self); 1685 map_clear (self);
1436 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1437 Safefree (self->tex); 1687 Safefree (self->tex);
1438 Safefree (self); 1688 Safefree (self);
1439} 1689}
1440 1690
1441void 1691void
1442resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1693 CODE:
1444 self->w = map_width; 1694 self->w = map_width;
1445 self->h = map_height; 1695 self->h = map_height;
1446 1696
1447void 1697void
1448clear (CFPlus::Map self) 1698clear (DC::Map self)
1449 CODE: 1699 CODE:
1450 map_clear (self); 1700 map_clear (self);
1451 1701
1452void 1702void
1453set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1704 CODE:
1455{ 1705{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1707 need_texid (self, tile);
1458} 1708}
1459 1709
1460void 1710void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1712 CODE:
1463{ 1713{
1464 tileid texid; 1714 tileid texid;
1465 maptex *tex; 1715 maptex *tex;
1466 1716
1479 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1481} 1731}
1482 1732
1483void 1733void
1484set_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)
1485 CODE: 1735 CODE:
1486{ 1736{
1487 need_texid (self, texid); 1737 need_texid (self, texid);
1488 1738
1489 { 1739 {
1509 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1761}
1512 1762
1513int 1763int
1514ox (CFPlus::Map self) 1764ox (DC::Map self)
1515 ALIAS: 1765 ALIAS:
1516 oy = 1 1766 oy = 1
1517 x = 2 1767 x = 2
1518 y = 3 1768 y = 3
1519 w = 4 1769 w = 4
1530 } 1780 }
1531 OUTPUT: 1781 OUTPUT:
1532 RETVAL 1782 RETVAL
1533 1783
1534void 1784void
1535scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1536 CODE: 1786 CODE:
1537{ 1787{
1538 if (dx > 0) 1788 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1790 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1557 } 1807 }
1558} 1808}
1559 1809
1560SV * 1810SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1812 CODE:
1563{ 1813{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1816 mapcell *cell;
1594 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1595 1845
1596 do 1846 do
1597 { 1847 {
1598 ext = *data++; 1848 ext = *data++;
1599 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1600 1850
1601 if (cmd < 4) 1851 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1604 { 1854 {
1607 } 1857 }
1608 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1611 { 1861 {
1612 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1613 ; // 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);
1614 1866
1615 data += *data + 1; 1867 data += *data + 1;
1616 } 1868 }
1617 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 1870 cell->flags = *data++;
1648 } 1900 }
1649 } 1901 }
1650 } 1902 }
1651 } 1903 }
1652 else 1904 else
1653 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1654 } 1906 }
1655} 1907}
1656 OUTPUT: 1908 OUTPUT:
1657 RETVAL 1909 RETVAL
1658 1910
1659SV * 1911SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1913 CODE:
1662{ 1914{
1663 int x1, x; 1915 int x1, x;
1664 int y1, y; 1916 int y1, y;
1665 int z; 1917 int z;
1710} 1962}
1711 OUTPUT: 1963 OUTPUT:
1712 RETVAL 1964 RETVAL
1713 1965
1714void 1966void
1715draw (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)
1716 CODE: 1968 CODE:
1717{ 1969{
1970 int x, y, z;
1971
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 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
1720 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)
1721 smooth_key skey; 1975 smooth_key skey;
1722 int x, y, z; 1976 int pl_x, pl_y;
1723 int last_name; 1977 maptex pl_tex;
1978 rc_t *rc = rc_alloc ();
1979 rc_key_t key;
1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1724 1983
1725 // thats current max. sorry. 1984 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1728 1987
1729 // clear key, in case of extra padding 1988 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1989 memset (&skey, 0, sizeof (skey));
1731 1990
1732 glColor4ub (255, 255, 255, 255); 1991 memset (&key, 0, sizeof (key));
1733 1992 key.r = 255;
1734 glEnable (GL_BLEND); 1993 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1994 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1995 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1996 key.mode = GL_QUADS;
1738 1997 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1998 key.texname = -1;
1742 1999
1743 mx += self->x; 2000 mx += self->x;
1744 my += self->y; 2001 my += self->y;
1745 2002
1746 // first pass: determine smooth_max 2003 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 2019 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2020 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2021 self->tex [cell->tile [2]].smoothlevel));
1765 } 2022 }
1766 } 2023 }
2024
2025 glEnable (GL_BLEND);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767 2028
1768 for (z = 0; z <= 2; z++) 2029 for (z = 0; z <= 2; z++)
1769 { 2030 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2031 memset (smooth_level, 0, sizeof (smooth_level));
1771 2032
1781 tileid tile = cell->tile [z]; 2042 tileid tile = cell->tile [z];
1782 2043
1783 if (tile) 2044 if (tile)
1784 { 2045 {
1785 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1786 int px, py; 2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1787 2049
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2050 if (key.texname != tex.name)
1791 { 2051 {
1792 if (!tex.name) 2052 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1794 2054
1795 glEnd (); 2055 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2056 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2057 }
1799 2058
1800 px = (x + 1) * T - tex.w; 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1801 py = (y + 1) * T - tex.h;
1802
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
2066
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 2075 if (cell->flags & 1)
1811 { 2076 {
1812 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 2078 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 2079 int py = y * T - T * 6 / 32;
1815 2080
2081 if (tex.name)
1816 glEnd (); 2082 {
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818 glBegin (GL_QUADS); 2093 }
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 } 2094 }
1825 } 2095 }
1826 2096
1827 // update smooth hash 2097 // update smooth hash
1828 if (tex.smoothtile) 2098 if (tex.smoothtile)
1864 } 2134 }
1865 } 2135 }
1866 } 2136 }
1867 } 2137 }
1868 2138
2139 rc_draw (rc);
2140 rc_clear (rc);
2141
1869 // go through all smoothlevels, lowest to highest, then draw. 2142 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2143 // this is basically counting sort
1871 { 2144 {
1872 int w, b; 2145 int w, b;
1873 2146
2147 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2149 for (w = 0; w < 256 / 32; ++w)
1875 { 2150 {
1876 uint32_t smask = smooth_level [w]; 2151 uint32_t smask = smooth_level [w];
1877 if (smask) 2152 if (smask)
1878 for (b = 0; b < 32; ++b) 2153 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2172 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2174 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2175 float dy = tex.t * .5f ; // 2 images/column
1901 2176
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2177 if (tex.name)
1905 { 2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
1906 if (!tex.name) 2181 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2182 {
1908
1909 glEnd (); 2183 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2185 glBegin (GL_QUADS);
1912 } 2186 }
1913 2187
1914 if (border) 2188 if (border)
1915 { 2189 {
1916 float ox = border * dx; 2190 float ox = border * dx;
1917 2191
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2196 }
1923 2197
1924 if (corner) 2198 if (corner)
1925 { 2199 {
1926 float ox = corner * dx; 2200 float ox = corner * dx;
1927 2201
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2206 }
1932 } 2207 }
1933 } 2208 }
1934 } 2209 }
1935 } 2210 }
1936 } 2211 }
2212
2213 glEnd ();
2214 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1;
1937 } 2216 }
1938 2217
1939 hv_clear (smooth); 2218 hv_clear (smooth);
1940 } 2219 }
1941 2220
1942 glEnd (); 2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
1943 2226
1944 glDisable (GL_TEXTURE_2D); 2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
2235 rc_draw (rc);
2236 }
2237
1945 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2239 rc_free (rc);
1946 2240
1947 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1950 { 2244 {
1975 } 2269 }
1976 } 2270 }
1977} 2271}
1978 2272
1979void 2273void
1980draw_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)
1981 CODE: 2275 CODE:
1982{ 2276{
1983 static float color[16][3] = { 2277 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2037} 2331}
2038 2332
2039void 2333void
2040fow_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)
2041 PPCODE: 2335 PPCODE:
2042{ 2336{
2043 int x, y; 2337 int x, y;
2044 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2348
2055 mx += self->x - 1; 2349 mx += self->x - 1;
2056 my += self->y - 1; 2350 my += self->y - 1;
2057 2351
2058 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059 2353
2060 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2062 { 2356 {
2063 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2118} 2412}
2119 2413
2120SV * 2414SV *
2121get_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)
2122 CODE: 2416 CODE:
2123{ 2417{
2124 int x, y, x1, y1; 2418 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2477 else
2184 *data++ = 0; 2478 *data++ = 0;
2185 } 2479 }
2186 } 2480 }
2187 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 {
2188 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2190 RETVAL = data_sv; 2489 RETVAL = data_sv;
2191} 2490}
2192 OUTPUT: 2491 OUTPUT:
2193 RETVAL 2492 RETVAL
2194 2493
2195void 2494void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2496 PPCODE:
2198{ 2497{
2199 int x, y, z; 2498 int x, y, z;
2200 int w, h; 2499 int w, h;
2201 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;
2202 2511
2203 if (*data++ != 0) 2512 if (*data++ != 0)
2204 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2205 2514
2206 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
2208 2517
2209 // 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
2221 { 2530 {
2222 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2223 2532
2224 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2225 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2226 uint8_t flags = *data++; 2540 flags = *data++;
2227 2541
2228 if (flags) 2542 if (flags)
2229 { 2543 {
2230 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2550
2237 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2238 { 2552 {
2239 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2240 2555
2241 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2242 { 2557 {
2243 tileid t = tile [z]; 2558 tileid t = tile [z];
2244 2559
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2561 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2563 need_texid (self, t);
2249 } 2564 }
2250 2565
2251 cell->tile [z] = t; 2566 cell->tile [z] = t;
2252 } 2567 }
2254 } 2569 }
2255 } 2570 }
2256 } 2571 }
2257} 2572}
2258 2573
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2575
2261CFPlus::RW 2576DC::RW
2262new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2263 CODE: 2578 CODE:
2264{ 2579{
2265 STRLEN datalen; 2580 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2584}
2270 OUTPUT: 2585 OUTPUT:
2271 RETVAL 2586 RETVAL
2272 2587
2273CFPlus::RW 2588DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2590 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2591 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2592 OUTPUT:
2278 RETVAL 2593 RETVAL
2279 2594
2280# fails on win32: 2595# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2596# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2597#void
2283#close (CFPlus::RW self) 2598#close (DC::RW self)
2284# CODE: 2599# CODE:
2285# (self->(close)) (self); 2600# (self->(close)) (self);
2286 2601
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2603
2289PROTOTYPES: DISABLE 2604PROTOTYPES: DISABLE
2290 2605
2291CFPlus::Channel 2606DC::Channel
2292find () 2607find ()
2293 CODE: 2608 CODE:
2294{ 2609{
2295 RETVAL = Mix_GroupAvailable (-1); 2610 RETVAL = Mix_GroupAvailable (-1);
2296 2611
2309} 2624}
2310 OUTPUT: 2625 OUTPUT:
2311 RETVAL 2626 RETVAL
2312 2627
2313void 2628void
2314halt (CFPlus::Channel self) 2629halt (DC::Channel self)
2315 CODE: 2630 CODE:
2316 Mix_HaltChannel (self); 2631 Mix_HaltChannel (self);
2317 2632
2318void 2633void
2319expire (CFPlus::Channel self, int ticks = -1) 2634expire (DC::Channel self, int ticks = -1)
2320 CODE: 2635 CODE:
2321 Mix_ExpireChannel (self, ticks); 2636 Mix_ExpireChannel (self, ticks);
2322 2637
2323void 2638void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2639fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2640 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2641 Mix_FadeOutChannel (self, ticks);
2327 2642
2328int 2643int
2329volume (CFPlus::Channel self, int volume) 2644volume (DC::Channel self, int volume)
2330 CODE: 2645 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2647 OUTPUT:
2333 RETVAL 2648 RETVAL
2334 2649
2335void 2650void
2336unregister_all_effects (CFPlus::Channel self) 2651unregister_all_effects (DC::Channel self)
2337 CODE: 2652 CODE:
2338 Mix_UnregisterAllEffects (self); 2653 Mix_UnregisterAllEffects (self);
2339 2654
2340void 2655void
2341set_panning (CFPlus::Channel self, int left, int right) 2656set_panning (DC::Channel self, int left, int right)
2342 CODE: 2657 CODE:
2343 left = CLAMP (left , 0, 255); 2658 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2659 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2660 Mix_SetPanning (self, left, right);
2346 2661
2347void 2662void
2348set_distance (CFPlus::Channel self, int distance) 2663set_distance (DC::Channel self, int distance)
2349 CODE: 2664 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2666
2352void 2667void
2353set_position (CFPlus::Channel self, int angle, int distance) 2668set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2669 CODE:
2355 2670
2356void 2671void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2673 CODE:
2359{ 2674{
2360 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));
2361 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);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2678}
2364 2679
2365void 2680void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2681set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2682 CODE:
2368 Mix_SetReverseStereo (self, flip); 2683 Mix_SetReverseStereo (self, flip);
2369 2684
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2686
2372PROTOTYPES: DISABLE 2687PROTOTYPES: DISABLE
2373 2688
2374CFPlus::MixChunk 2689DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2690new (SV *class, DC::RW rwops)
2376 CODE: 2691 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2693 OUTPUT:
2379 RETVAL 2694 RETVAL
2380 2695
2381void 2696void
2382DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2383 CODE: 2698 CODE:
2384 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2385 2700
2386int 2701int
2387volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2703 CODE:
2389 if (items > 1) 2704 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2705 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2707 OUTPUT:
2393 RETVAL 2708 RETVAL
2394 2709
2395CFPlus::Channel 2710DC::Channel
2396play (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)
2397 CODE: 2712 CODE:
2398{ 2713{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2715
2401 if (RETVAL < 0) 2716 if (RETVAL < 0)
2408 } 2723 }
2409} 2724}
2410 OUTPUT: 2725 OUTPUT:
2411 RETVAL 2726 RETVAL
2412 2727
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2729
2415int 2730int
2416volume (int volume = -1) 2731volume (int volume = -1)
2417 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2418 CODE: 2733 CODE:
2430void 2745void
2431halt () 2746halt ()
2432 CODE: 2747 CODE:
2433 Mix_HaltMusic (); 2748 Mix_HaltMusic ();
2434 2749
2435CFPlus::MixMusic 2750DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2751new (SV *class, DC::RW rwops)
2437 CODE: 2752 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2754 OUTPUT:
2440 RETVAL 2755 RETVAL
2441 2756
2442void 2757void
2443DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2444 CODE: 2759 CODE:
2445 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2446 2761
2447int 2762int
2448play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2449 CODE: 2764 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2766 OUTPUT:
2452 RETVAL 2767 RETVAL
2453 2768
2454void 2769void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2771 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2773
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2775
2461PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2462 2777
2463BOOT: 2778BOOT:
2464{ 2779{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2781 static const struct {
2467 const char *name; 2782 const char *name;
2468 IV iv; 2783 IV iv;
2469 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2832 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2833 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2875 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2876 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2881 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2882 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
2570 2892
2571 texture_av = newAV (); 2893 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2894 AvREAL_off (texture_av);
2573} 2895}
2574 2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
2902
2575char * 2903char *
2576gl_vendor () 2904gl_vendor ()
2577 CODE: 2905 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2907 OUTPUT:
2700 3028
2701void glRect (float x1, float y1, float x2, float y2) 3029void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3030 CODE:
2703 glRectf (x1, y1, x2, y2); 3031 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 3042PROTOTYPES: ENABLE
2706 3043
2707void glBegin (int mode) 3044void glBegin (int mode)
2708 3045
2709void glEnd () 3046void glEnd ()
2741void 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)
2742 CODE: 3079 CODE:
2743 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3082
2746void 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)
2747 3084
2748void 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)
2749 3086
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3088
2777 3114
2778void glEndList () 3115void glEndList ()
2779 3116
2780void glCallList (int list) 3117void glCallList (int list)
2781 3118
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3120
2784PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2785 3122
2786void 3123void
2787find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3128 XPUSHs (self);
2792} 3129}
2793 3130
2794BOOT: 3131BOOT:
2795{ 3132{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3134
2798 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);
2799 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);
2800 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);
2801 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);
2802} 3139}
2803 3140
2804void 3141void
2805draw (SV *self) 3142draw (SV *self)
2806 CODE: 3143 CODE:
2810 NV x, y, w, h; 3147 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3148 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3149 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3152 double draw_x, draw_y;
2817 3153
2818 if (!SvROK (self)) 3154 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3156
2821 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2822 3158
2823 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3161
2826 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.;
2827 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.;
2828 3164
2829 if (!h || !w) 3165 if (!h || !w)
2849 { 3185 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3187
2852 if (svp && SvTRUE (*svp)) 3188 if (svp && SvTRUE (*svp))
2853 { 3189 {
2854 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);
2855 glEnable (GL_BLEND); 3191 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3193 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3194 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3195 glVertex2f (w, 0);
2862 glEnd (); 3198 glEnd ();
2863 glDisable (GL_BLEND); 3199 glDisable (GL_BLEND);
2864 } 3200 }
2865 } 3201 }
2866#if 0 3202#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3203 // draw borders, for debugging
2868 glPushMatrix; 3204 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3205 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3206 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3207 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3208 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3209 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3210 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3211 glVertex2f (0 , h - 1);
2876 glEnd; 3212 glEnd ();
2877 glPopMatrix; 3213 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3214#endif
2881 PUSHMARK (SP); 3215 PUSHMARK (SP);
2882 XPUSHs (self); 3216 XPUSHs (self);
2883 PUTBACK; 3217 PUTBACK;
2884 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