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.275 by root, Thu Aug 28 00:53:53 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines