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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 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
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#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
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 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
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 95
69static AV *texture_av; 96static AV *texture_av;
70 97
71static struct 98static struct
72{ 99{
109 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
111} 138}
112 139
113#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
114 142
115#include "pango-font.c" 143#include "pango-font.c"
116#include "pango-fontmap.c" 144#include "pango-fontmap.c"
117#include "pango-render.c" 145#include "pango-render.c"
118 146
119typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
123 151
124typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
125 153
126static int 154static int
127shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
128{ 156{
129 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
143 171
144typedef struct cf_layout { 172typedef struct cf_layout {
145 PangoLayout *pl; 173 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
147 int base_height; 175 int base_height;
148 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
149} *CFPlus__Layout; 178} *DC__Layout;
150 179
151static CFPlus__Font default_font; 180static DC__Font default_font;
152static PangoContext *opengl_context; 181static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
154 183
155static void 184static void
156substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
161#endif 190#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 192}
164 193
165static void 194static void
166layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
167{ 196{
168 /* 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
169 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
170 */ 199 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
172 201
173 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 204
176 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
177} 206}
178 207
179static void 208static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 210{
182 PangoRectangle rect; 211 PangoRectangle rect;
183 212
184 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
196 225
197typedef uint16_t tileid; 226typedef uint16_t tileid;
198typedef uint16_t faceid; 227typedef uint16_t faceid;
199 228
200typedef struct { 229typedef struct {
201 int name; 230 GLuint name;
202 int w, h; 231 int w, h;
203 float s, t; 232 float s, t;
204 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
205 tileid smoothtile; 234 tileid smoothtile;
206 uint8_t smoothlevel; 235 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
226 255
227 int32_t rows; 256 int32_t rows;
228 maprow *row; 257 maprow *row;
229} *CFPlus__Map; 258} *DC__Map;
230 259
231static char * 260static char *
232prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
233{ 262{
234 char *p; 263 char *p;
272 self->texs *= 2; 301 self->texs *= 2;
273 } 302 }
274} 303}
275 304
276static maprow * 305static maprow *
277map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
278{ 307{
279 if (0 > y) 308 if (0 > y)
280 { 309 {
281 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
320 349
321 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
322} 351}
323 352
324static mapcell * 353static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
326{ 355{
327 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
328} 357}
329 358
330static void 359static void
331map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
332{ 361{
333 int r; 362 int r;
334 363
335 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
343 self->oy = 0; 372 self->oy = 0;
344 self->row = 0; 373 self->row = 0;
345 self->rows = 0; 374 self->rows = 0;
346} 375}
347 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
348static void 387static void
349map_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)
350{ 389{
351 int x, y; 390 int x, y;
352 maprow *row; 391 maprow *row;
353 mapcell *cell; 392 mapcell *cell;
354 393
366 if (x >= row->c1) 405 if (x >= row->c1)
367 break; 406 break;
368 407
369 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
370 409
371 cell->darkness = 0; 410 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 411 }
376 } 412 }
377} 413}
378 414
379typedef struct { 415typedef struct {
433 n |= n >> 16; 469 n |= n >> 16;
434 470
435 return n + 1; 471 return n + 1;
436} 472}
437 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
438/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
441 488
442/******************************************************************************/ 489/******************************************************************************/
480 return 0; 527 return 0;
481 528
482 return 1; 529 return 1;
483} 530}
484 531
485MODULE = 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
486 571
487PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
488 573
489BOOT: 574BOOT:
490{ 575{
491 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 577 static const struct {
493 const char *name; 578 const char *name;
494 IV iv; 579 IV iv;
495 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
518 603
519 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
522 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),
523 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
603 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)
604# undef const_iv 772# undef const_iv
605 }; 773 };
606 774
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 794
627NV floor (NV x) 795NV floor (NV x)
628 796
629NV ceil (NV x) 797NV ceil (NV x)
630 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
631void 803void
632pango_init () 804pango_init ()
633 CODE: 805 CODE:
634{ 806{
635 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
636 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);
637 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
638} 815}
639 816
640char *
641SDL_GetError () 817char *SDL_GetError ()
642 818
643int 819void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 820
646void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
647SDL_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
648 837
649void 838void
650SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
651 PPCODE: 840 PPCODE:
652{ 841{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 856
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 859
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 861
676 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
677 while (*m) 863 while (*m)
678 { 864 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 866 {
681 AV *av = newAV (); 867 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
708 894
709 if (RETVAL) 895 if (RETVAL)
710 { 896 {
711 av_clear (texture_av); 897 av_clear (texture_av);
712 898
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 901#include "glfunc.h"
716#undef GL_FUNC 902#undef GL_FUNC
717 } 903 }
718} 904}
725char * 911char *
726SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
727 913
728int 914int
729SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
730 919
731void 920void
732poll_events () 921poll_events ()
733 PPCODE: 922 PPCODE:
734{ 923{
744 { 933 {
745 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
746 case SDL_KEYUP: 935 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 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);
750 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 */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 941 break;
753 942
754 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 962 x = ev.motion.x;
774 y = ev.motion.y; 963 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 965 }
777 966
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 973 }
785 break; 974 break;
786 975
787 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 979
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 990 break;
802 } 991 }
803 992
804 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))));
805 } 994 }
806} 995}
807 996
808int 997int
809Mix_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)
810 POSTCALL: 999 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
812 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}
813 1018
814void 1019void
815Mix_CloseAudio () 1020Mix_CloseAudio ()
816 1021
817int 1022int
852 } 1057 }
853 } 1058 }
854#endif 1059#endif
855} 1060}
856 1061
857void 1062int
858add_font (char *file) 1063add_font (char *file)
859 CODE: 1064 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
861 1068
862void 1069void
863load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
864 ALIAS: 1071 ALIAS:
865 load_image_file = 1 1072 load_image_file = 1
951void 1158void
952error (char *message) 1159error (char *message)
953 CODE: 1160 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1162#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1164#endif
958 1165
959void 1166void
960fatal (char *message) 1167fatal (char *message)
961 CODE: 1168 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1170#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1172#endif
966 _exit (1); 1173 _exit (1);
967 1174
968void 1175void
969_exit (int retval = 0) 1176_exit (int retval = 0)
981#if DEBUG 1188#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
983#endif 1190#endif
984} 1191}
985 1192
986MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
987 1194
988PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
989 1196
990CFPlus::Font 1197DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1199 CODE:
993{ 1200{
994 int count; 1201 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1205}
999 OUTPUT: 1206 OUTPUT:
1000 RETVAL 1207 RETVAL
1001 1208
1002void 1209void
1003DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
1004 CODE: 1211 CODE:
1005 pango_font_description_free (self); 1212 pango_font_description_free (self);
1006 1213
1007void 1214void
1008make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1009 PROTOTYPE: $ 1216 PROTOTYPE: $
1010 CODE: 1217 CODE:
1011 default_font = self; 1218 default_font = self;
1012 1219
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1221
1015PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1016 1223
1017void 1224void
1018reset_glyph_cache () 1225glyph_cache_backup ()
1019 PROTOTYPE: 1226 PROTOTYPE:
1020 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
1021 tc_clear (); 1234 tc_restore ();
1022 1235
1023CFPlus::Layout 1236DC::Layout
1024new (SV *class) 1237new (SV *class)
1025 CODE: 1238 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1027 1240
1028 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1243 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1244 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1245 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1246 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1247 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1035 1249
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1038 OUTPUT: 1252 OUTPUT:
1039 RETVAL 1253 RETVAL
1040 1254
1041void 1255void
1042DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
1043 CODE: 1257 CODE:
1044 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1259 rc_free (self->rc);
1045 Safefree (self); 1260 Safefree (self);
1046 1261
1047void 1262void
1048set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1049 CODE: 1264 CODE:
1050{ 1265{
1051 STRLEN textlen; 1266 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1053 1268
1054 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1055} 1270}
1056 1271
1057void 1272void
1058set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1059 CODE: 1274 CODE:
1060{ 1275{
1061 STRLEN textlen; 1276 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1063 1278
1064 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1065} 1280}
1066 1281
1067void 1282void
1068set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1069 CODE: 1284 CODE:
1070{ 1285{
1071 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1288 const char *pos = text;
1108 if (attrs) 1323 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1110} 1325}
1111 1326
1112void 1327void
1113get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1114 PPCODE: 1329 PPCODE:
1115{ 1330{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1332
1118 do 1333 do
1119 { 1334 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1336
1122 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1123 { 1338 {
1124 PangoRectangle extents; 1339 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1348
1134 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1135} 1350}
1136 1351
1137int 1352int
1138has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1139 CODE: 1354 CODE:
1140{ 1355{
1141 int lines = 1; 1356 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1143 1358
1148} 1363}
1149 OUTPUT: 1364 OUTPUT:
1150 RETVAL 1365 RETVAL
1151 1366
1152SV * 1367SV *
1153get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1154 CODE: 1369 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1372 OUTPUT:
1158 RETVAL 1373 RETVAL
1159 1374
1160void 1375void
1161set_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.)
1162 CODE: 1377 CODE:
1163 self->r = r; 1378 self->r = r;
1164 self->g = g; 1379 self->g = g;
1165 self->b = b; 1380 self->b = b;
1166 self->a = a; 1381 self->a = a;
1167 1382
1168void 1383void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1385 CODE:
1171 if (self->font != font) 1386 if (self->font != font)
1172 { 1387 {
1173 self->font = font; 1388 self->font = font;
1174 layout_update_font (self); 1389 layout_update_font (self);
1175 } 1390 }
1176 1391
1177void 1392void
1178set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1179 CODE: 1394 CODE:
1180 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1181 { 1396 {
1182 self->base_height = base_height; 1397 self->base_height = base_height;
1183 layout_update_font (self); 1398 layout_update_font (self);
1184 } 1399 }
1185 1400
1186void 1401void
1187set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1403 CODE:
1189 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);
1190 1405
1191void 1406void
1192set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1193 CODE: 1408 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1410
1196void 1411void
1197set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1198 CODE: 1413 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1415
1201void 1416void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1418 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1209 ); 1424 );
1210 1425
1211void 1426void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1428 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1430
1216void 1431void
1217size (CFPlus::Layout self) 1432size (DC::Layout self)
1218 PPCODE: 1433 PPCODE:
1219{ 1434{
1220 int w, h; 1435 int w, h;
1221 1436
1222 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1227} 1442}
1228 1443
1229int 1444int
1230descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1231 CODE: 1446 CODE:
1232{ 1447{
1233 PangoRectangle rect; 1448 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1237} 1452}
1238 OUTPUT: 1453 OUTPUT:
1239 RETVAL 1454 RETVAL
1240 1455
1241int 1456int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1458 CODE:
1244{ 1459{
1245 int index, trailing; 1460 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1248} 1463}
1249 OUTPUT: 1464 OUTPUT:
1250 RETVAL 1465 RETVAL
1251 1466
1252void 1467void
1253cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1469 PPCODE:
1255{ 1470{
1256 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1473
1259 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1478}
1264 1479
1265void 1480void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1482 PPCODE:
1268{ 1483{
1269 int line, x; 1484 int line, x;
1270 1485
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1489 --line;
1490#endif
1274 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1494}
1278 1495
1279void 1496void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1498 PPCODE:
1282{ 1499{
1283 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1284 int index, trailing; 1501 int index, trailing;
1285 1502
1286 if (line < 0) 1503 if (line < 0)
1287 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1288 1505
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1291 1508
1292 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);
1293 1510
1294 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1518 }
1302} 1519}
1303 1520
1304void 1521void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1523 CODE:
1524 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1308 self->pl, 1526 self->pl,
1527 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1528 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1529 self->r, self->g, self->b, self->a,
1311 flags 1530 flags
1312 ); 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);
1313 1535
1314MODULE = 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
1315 1556
1316PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1558
1320void 1559void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1561 CODE:
1323{ 1562{
1400 RETVAL = width > 0; 1639 RETVAL = width > 0;
1401} 1640}
1402 OUTPUT: 1641 OUTPUT:
1403 RETVAL 1642 RETVAL
1404 1643
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1645
1407PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1408 1647
1409CFPlus::Map 1648DC::Map
1410new (SV *class) 1649new (SV *class)
1411 CODE: 1650 CODE:
1412 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1652 RETVAL->x = 0;
1414 RETVAL->y = 0; 1653 RETVAL->y = 0;
1422 RETVAL->row = 0; 1661 RETVAL->row = 0;
1423 OUTPUT: 1662 OUTPUT:
1424 RETVAL 1663 RETVAL
1425 1664
1426void 1665void
1427DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1428 CODE: 1667 CODE:
1429{ 1668{
1430 map_clear (self); 1669 map_clear (self);
1431 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1432 Safefree (self->tex); 1671 Safefree (self->tex);
1433 Safefree (self); 1672 Safefree (self);
1434} 1673}
1435 1674
1436void 1675void
1437resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1677 CODE:
1439 self->w = map_width; 1678 self->w = map_width;
1440 self->h = map_height; 1679 self->h = map_height;
1441 1680
1442void 1681void
1443clear (CFPlus::Map self) 1682clear (DC::Map self)
1444 CODE: 1683 CODE:
1445 map_clear (self); 1684 map_clear (self);
1446 1685
1447void 1686void
1448set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1688 CODE:
1450{ 1689{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1691 need_texid (self, tile);
1453} 1692}
1454 1693
1455void 1694void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1696 CODE:
1458{ 1697{
1459 tileid texid; 1698 tileid texid;
1460 maptex *tex; 1699 maptex *tex;
1461 1700
1474 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1476} 1715}
1477 1716
1478void 1717void
1479set_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)
1480 CODE: 1719 CODE:
1481{ 1720{
1482 need_texid (self, texid); 1721 need_texid (self, texid);
1483 1722
1484 { 1723 {
1504 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1745}
1507 1746
1508int 1747int
1509ox (CFPlus::Map self) 1748ox (DC::Map self)
1510 ALIAS: 1749 ALIAS:
1511 oy = 1 1750 oy = 1
1512 x = 2 1751 x = 2
1513 y = 3 1752 y = 3
1514 w = 4 1753 w = 4
1525 } 1764 }
1526 OUTPUT: 1765 OUTPUT:
1527 RETVAL 1766 RETVAL
1528 1767
1529void 1768void
1530scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1531 CODE: 1770 CODE:
1532{ 1771{
1533 if (dx > 0) 1772 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1774 else if (dx < 0)
1551 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1552 } 1791 }
1553} 1792}
1554 1793
1555SV * 1794SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1796 CODE:
1558{ 1797{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1800 mapcell *cell;
1589 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1590 1829
1591 do 1830 do
1592 { 1831 {
1593 ext = *data++; 1832 ext = *data++;
1594 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1595 1834
1596 if (cmd < 4) 1835 if (cmd < 4)
1597 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1598 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1599 { 1838 {
1602 } 1841 }
1603 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1604 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1605 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1606 { 1845 {
1607 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1608 ; // 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);
1609 1850
1610 data += *data + 1; 1851 data += *data + 1;
1611 } 1852 }
1612 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1613 cell->flags = *data++; 1854 cell->flags = *data++;
1643 } 1884 }
1644 } 1885 }
1645 } 1886 }
1646 } 1887 }
1647 else 1888 else
1648 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1649 } 1890 }
1650} 1891}
1651 OUTPUT: 1892 OUTPUT:
1652 RETVAL 1893 RETVAL
1653 1894
1654SV * 1895SV *
1655mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1656 CODE: 1897 CODE:
1657{ 1898{
1658 int x1, x; 1899 int x1, x;
1659 int y1, y; 1900 int y1, y;
1660 int z; 1901 int z;
1705} 1946}
1706 OUTPUT: 1947 OUTPUT:
1707 RETVAL 1948 RETVAL
1708 1949
1709void 1950void
1710draw (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)
1711 CODE: 1952 CODE:
1712{ 1953{
1954 int x, y, z;
1955
1713 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1714 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
1715 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)
1716 smooth_key skey; 1959 smooth_key skey;
1717 int x, y, z; 1960 int pl_x, pl_y;
1718 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;
1719 1967
1720 // thats current max. sorry. 1968 // thats current max. sorry.
1721 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1722 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1723 1971
1724 // clear key, in case of extra padding 1972 // clear key, in case of extra padding
1725 memset (&skey, 0, sizeof (skey)); 1973 memset (&skey, 0, sizeof (skey));
1726 1974
1727 glColor4ub (255, 255, 255, 255); 1975 memset (&key, 0, sizeof (key));
1728 1976 key.r = 255;
1729 glEnable (GL_BLEND); 1977 key.g = 255;
1730 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1978 key.b = 255;
1731 glEnable (GL_TEXTURE_2D); 1979 key.a = 255;
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1980 key.mode = GL_QUADS;
1733 1981 key.format = GL_T2F_V3F;
1734 glBegin (GL_QUADS);
1735
1736 last_name = -1; 1982 key.texname = -1;
1737 1983
1738 mx += self->x; 1984 mx += self->x;
1739 my += self->y; 1985 my += self->y;
1740 1986
1741 // first pass: determine smooth_max 1987 // first pass: determine smooth_max
1757 MAX (self->tex [cell->tile [0]].smoothlevel, 2003 MAX (self->tex [cell->tile [0]].smoothlevel,
1758 MAX (self->tex [cell->tile [1]].smoothlevel, 2004 MAX (self->tex [cell->tile [1]].smoothlevel,
1759 self->tex [cell->tile [2]].smoothlevel)); 2005 self->tex [cell->tile [2]].smoothlevel));
1760 } 2006 }
1761 } 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);
1762 2012
1763 for (z = 0; z <= 2; z++) 2013 for (z = 0; z <= 2; z++)
1764 { 2014 {
1765 memset (smooth_level, 0, sizeof (smooth_level)); 2015 memset (smooth_level, 0, sizeof (smooth_level));
1766 2016
1776 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1777 2027
1778 if (tile) 2028 if (tile)
1779 { 2029 {
1780 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1781 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1782 2033
1783 // suppressing texture state switches here
1784 // is only moderately effective, but worth the extra effort
1785 if (last_name != tex.name) 2034 if (key.texname != tex.name)
1786 { 2035 {
1787 if (!tex.name) 2036 if (!tex.name)
1788 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1789 2038
1790 glEnd (); 2039 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2040 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2041 }
1794 2042
1795 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 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
1805 if (cell->flags & 1) 2059 if (cell->flags & 1)
1806 { 2060 {
1807 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 2062 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 2063 int py = y * T - T * 6 / 32;
1810 2064
2065 if (tex.name)
1811 glEnd (); 2066 {
1812 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);
1813 glBegin (GL_QUADS); 2077 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 2078 }
1820 } 2079 }
1821 2080
1822 // update smooth hash 2081 // update smooth hash
1823 if (tex.smoothtile) 2082 if (tex.smoothtile)
1859 } 2118 }
1860 } 2119 }
1861 } 2120 }
1862 } 2121 }
1863 2122
2123 rc_draw (rc);
2124 rc_clear (rc);
2125
1864 // go through all smoothlevels, lowest to highest, then draw. 2126 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2127 // this is basically counting sort
1866 { 2128 {
1867 int w, b; 2129 int w, b;
1868 2130
2131 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2133 for (w = 0; w < 256 / 32; ++w)
1870 { 2134 {
1871 uint32_t smask = smooth_level [w]; 2135 uint32_t smask = smooth_level [w];
1872 if (smask) 2136 if (smask)
1873 for (b = 0; b < 32; ++b) 2137 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2156 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2158 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2159 float dy = tex.t * .5f ; // 2 images/column
1896 2160
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2161 if (tex.name)
1900 { 2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
1901 if (!tex.name) 2165 if (key.texname != tex.name)
1902 continue; // smoothing not yet available 2166 {
1903
1904 glEnd (); 2167 glEnd ();
1905 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1906 glBegin (GL_QUADS); 2169 glBegin (GL_QUADS);
1907 } 2170 }
1908 2171
1909 if (border) 2172 if (border)
1910 { 2173 {
1911 float ox = border * dx; 2174 float ox = border * dx;
1912 2175
1913 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1917 } 2180 }
1918 2181
1919 if (corner) 2182 if (corner)
1920 { 2183 {
1921 float ox = corner * dx; 2184 float ox = corner * dx;
1922 2185
1923 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2186 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1924 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1925 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1926 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2190 }
1927 } 2191 }
1928 } 2192 }
1929 } 2193 }
1930 } 2194 }
1931 } 2195 }
2196
2197 glEnd ();
2198 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1;
1932 } 2200 }
1933 2201
1934 hv_clear (smooth); 2202 hv_clear (smooth);
1935 } 2203 }
1936 2204
1937 glEnd (); 2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
1938 2210
1939 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
1940 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2223 rc_free (rc);
1941 2224
1942 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
1943 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2227 if (0 <= y + my && y + my < self->rows)
1945 { 2228 {
1970 } 2253 }
1971 } 2254 }
1972} 2255}
1973 2256
1974void 2257void
1975draw_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)
1976 CODE: 2259 CODE:
1977{ 2260{
1978 static float color[16][3] = { 2261 static float color[16][3] = {
1979 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
1980 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2030 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2031 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2032} 2315}
2033 2316
2034void 2317void
2035fow_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)
2036 PPCODE: 2319 PPCODE:
2037{ 2320{
2038 int x, y; 2321 int x, y;
2039 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2040 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2048 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2049 2332
2050 mx += self->x - 1; 2333 mx += self->x - 1;
2051 my += self->y - 1; 2334 my += self->y - 1;
2052 2335
2053 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2054 2337
2055 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2056 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2057 { 2340 {
2058 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2111 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2112 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2113} 2396}
2114 2397
2115SV * 2398SV *
2116get_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)
2117 CODE: 2400 CODE:
2118{ 2401{
2119 int x, y, x1, y1; 2402 int x, y, x1, y1;
2120 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2178 else 2461 else
2179 *data++ = 0; 2462 *data++ = 0;
2180 } 2463 }
2181 } 2464 }
2182 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 {
2183 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2184 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2185 RETVAL = data_sv; 2473 RETVAL = data_sv;
2186} 2474}
2187 OUTPUT: 2475 OUTPUT:
2188 RETVAL 2476 RETVAL
2189 2477
2190void 2478void
2191set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2192 PPCODE: 2480 PPCODE:
2193{ 2481{
2194 int x, y, z; 2482 int x, y, z;
2195 int w, h; 2483 int w, h;
2196 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;
2197 2495
2198 if (*data++ != 0) 2496 if (*data++ != 0)
2199 return; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2200 2498
2201 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2202 h = *data++ << 8; h |= *data++; 2500 h = *data++ << 8; h |= *data++;
2203 2501
2204 // 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
2216 { 2514 {
2217 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2218 2516
2219 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2220 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2221 uint8_t flags = *data++; 2524 flags = *data++;
2222 2525
2223 if (flags) 2526 if (flags)
2224 { 2527 {
2225 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2226 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2229 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2230 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2231 2534
2232 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2233 { 2536 {
2234 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2235 2539
2236 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2237 { 2541 {
2238 tileid t = tile [z]; 2542 tileid t = tile [z];
2239 2543
2240 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2241 { 2545 {
2242 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2243 need_texid (self, t); 2547 need_texid (self, t);
2244 } 2548 }
2245 2549
2246 cell->tile [z] = t; 2550 cell->tile [z] = t;
2247 } 2551 }
2249 } 2553 }
2250 } 2554 }
2251 } 2555 }
2252} 2556}
2253 2557
2254MODULE = CFPlus PACKAGE = CFPlus::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2255 2559
2256CFPlus::RW 2560DC::RW
2257new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2258 CODE: 2562 CODE:
2259{ 2563{
2260 STRLEN datalen; 2564 STRLEN datalen;
2261 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2263 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2264} 2568}
2265 OUTPUT: 2569 OUTPUT:
2266 RETVAL 2570 RETVAL
2267 2571
2268CFPlus::RW 2572DC::RW
2269new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2270 CODE: 2574 CODE:
2271 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2272 OUTPUT: 2576 OUTPUT:
2273 RETVAL 2577 RETVAL
2274 2578
2275# fails on win32: 2579# fails on win32:
2276# CFPlus.xs(2268) : error C2059: syntax error : '(' 2580# dc.xs(2268) : error C2059: syntax error : '('
2277#void 2581#void
2278#close (CFPlus::RW self) 2582#close (DC::RW self)
2279# CODE: 2583# CODE:
2280# (self->(close)) (self); 2584# (self->(close)) (self);
2281 2585
2282MODULE = CFPlus PACKAGE = CFPlus::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2283 2587
2284PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2285 2589
2286CFPlus::Channel 2590DC::Channel
2287find () 2591find ()
2288 CODE: 2592 CODE:
2289{ 2593{
2290 RETVAL = Mix_GroupAvailable (-1); 2594 RETVAL = Mix_GroupAvailable (-1);
2291 2595
2304} 2608}
2305 OUTPUT: 2609 OUTPUT:
2306 RETVAL 2610 RETVAL
2307 2611
2308void 2612void
2309halt (CFPlus::Channel self) 2613halt (DC::Channel self)
2310 CODE: 2614 CODE:
2311 Mix_HaltChannel (self); 2615 Mix_HaltChannel (self);
2312 2616
2313void 2617void
2314expire (CFPlus::Channel self, int ticks = -1) 2618expire (DC::Channel self, int ticks = -1)
2315 CODE: 2619 CODE:
2316 Mix_ExpireChannel (self, ticks); 2620 Mix_ExpireChannel (self, ticks);
2317 2621
2318void 2622void
2319fade_out (CFPlus::Channel self, int ticks = -1) 2623fade_out (DC::Channel self, int ticks = -1)
2320 CODE: 2624 CODE:
2321 Mix_FadeOutChannel (self, ticks); 2625 Mix_FadeOutChannel (self, ticks);
2322 2626
2323int 2627int
2324volume (CFPlus::Channel self, int volume) 2628volume (DC::Channel self, int volume)
2325 CODE: 2629 CODE:
2326 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2327 OUTPUT: 2631 OUTPUT:
2328 RETVAL 2632 RETVAL
2329 2633
2330void 2634void
2331unregister_all_effects (CFPlus::Channel self) 2635unregister_all_effects (DC::Channel self)
2332 CODE: 2636 CODE:
2333 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2334 2638
2335void 2639void
2336set_panning (CFPlus::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2337 CODE: 2641 CODE:
2338 left = CLAMP (left , 0, 255); 2642 left = CLAMP (left , 0, 255);
2339 right = CLAMP (right, 0, 255); 2643 right = CLAMP (right, 0, 255);
2340 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2341 2645
2342void 2646void
2343set_distance (CFPlus::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2344 CODE: 2648 CODE:
2345 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2346 2650
2347void 2651void
2348set_position (CFPlus::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2349 CODE: 2653 CODE:
2350 2654
2351void 2655void
2352set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2353 CODE: 2657 CODE:
2354{ 2658{
2355 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));
2356 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);
2357 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2358} 2662}
2359 2663
2360void 2664void
2361set_reverse_stereo (CFPlus::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2362 CODE: 2666 CODE:
2363 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2364 2668
2365MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2366 2670
2367PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2368 2672
2369CFPlus::MixChunk 2673DC::MixChunk
2370new (SV *class, CFPlus::RW rwops) 2674new (SV *class, DC::RW rwops)
2371 CODE: 2675 CODE:
2372 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2373 OUTPUT: 2677 OUTPUT:
2374 RETVAL 2678 RETVAL
2375 2679
2376void 2680void
2377DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2378 CODE: 2682 CODE:
2379 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2380 2684
2381int 2685int
2382volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2383 CODE: 2687 CODE:
2384 if (items > 1) 2688 if (items > 1)
2385 volume = CLAMP (volume, 0, 128); 2689 volume = CLAMP (volume, 0, 128);
2386 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2387 OUTPUT: 2691 OUTPUT:
2388 RETVAL 2692 RETVAL
2389 2693
2390CFPlus::Channel 2694DC::Channel
2391play (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)
2392 CODE: 2696 CODE:
2393{ 2697{
2394 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2395 2699
2396 if (RETVAL < 0) 2700 if (RETVAL < 0)
2403 } 2707 }
2404} 2708}
2405 OUTPUT: 2709 OUTPUT:
2406 RETVAL 2710 RETVAL
2407 2711
2408MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2409 2713
2410int 2714int
2411volume (int volume = -1) 2715volume (int volume = -1)
2412 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2413 CODE: 2717 CODE:
2425void 2729void
2426halt () 2730halt ()
2427 CODE: 2731 CODE:
2428 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2429 2733
2430CFPlus::MixMusic 2734DC::MixMusic
2431new (SV *class, CFPlus::RW rwops) 2735new (SV *class, DC::RW rwops)
2432 CODE: 2736 CODE:
2433 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2434 OUTPUT: 2738 OUTPUT:
2435 RETVAL 2739 RETVAL
2436 2740
2437void 2741void
2438DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2439 CODE: 2743 CODE:
2440 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2441 2745
2442int 2746int
2443play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2444 CODE: 2748 CODE:
2445 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2446 OUTPUT: 2750 OUTPUT:
2447 RETVAL 2751 RETVAL
2448 2752
2449void 2753void
2450fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2451 CODE: 2755 CODE:
2452 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2453 2757
2454MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2455 2759
2456PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2457 2761
2458BOOT: 2762BOOT:
2459{ 2763{
2460 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2461 static const struct { 2765 static const struct {
2462 const char *name; 2766 const char *name;
2463 IV iv; 2767 IV iv;
2464 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2465# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2500 const_iv (GL_INTENSITY), 2804 const_iv (GL_INTENSITY),
2501 const_iv (GL_LUMINANCE), 2805 const_iv (GL_LUMINANCE),
2502 const_iv (GL_LUMINANCE_ALPHA), 2806 const_iv (GL_LUMINANCE_ALPHA),
2503 const_iv (GL_FLOAT), 2807 const_iv (GL_FLOAT),
2504 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),
2505 const_iv (GL_COMPILE), 2815 const_iv (GL_COMPILE),
2506 const_iv (GL_PROXY_TEXTURE_1D), 2816 const_iv (GL_PROXY_TEXTURE_1D),
2507 const_iv (GL_PROXY_TEXTURE_2D), 2817 const_iv (GL_PROXY_TEXTURE_2D),
2508 const_iv (GL_TEXTURE_1D), 2818 const_iv (GL_TEXTURE_1D),
2509 const_iv (GL_TEXTURE_2D), 2819 const_iv (GL_TEXTURE_2D),
2548 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2858 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2549 const_iv (GL_POINT_SMOOTH_HINT), 2859 const_iv (GL_POINT_SMOOTH_HINT),
2550 const_iv (GL_LINE_SMOOTH_HINT), 2860 const_iv (GL_LINE_SMOOTH_HINT),
2551 const_iv (GL_POLYGON_SMOOTH_HINT), 2861 const_iv (GL_POLYGON_SMOOTH_HINT),
2552 const_iv (GL_GENERATE_MIPMAP_HINT), 2862 const_iv (GL_GENERATE_MIPMAP_HINT),
2863 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2553 const_iv (GL_FASTEST), 2864 const_iv (GL_FASTEST),
2554 const_iv (GL_DONT_CARE), 2865 const_iv (GL_DONT_CARE),
2555 const_iv (GL_NICEST), 2866 const_iv (GL_NICEST),
2556 const_iv (GL_V2F), 2867 const_iv (GL_V2F),
2557 const_iv (GL_V3F), 2868 const_iv (GL_V3F),
2565 2876
2566 texture_av = newAV (); 2877 texture_av = newAV ();
2567 AvREAL_off (texture_av); 2878 AvREAL_off (texture_av);
2568} 2879}
2569 2880
2881void
2882disable_GL_EXT_blend_func_separate ()
2883 CODE:
2884 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0;
2886
2570char * 2887char *
2571gl_vendor () 2888gl_vendor ()
2572 CODE: 2889 CODE:
2573 RETVAL = (char *)glGetString (GL_VENDOR); 2890 RETVAL = (char *)glGetString (GL_VENDOR);
2574 OUTPUT: 2891 OUTPUT:
2695 3012
2696void glRect (float x1, float y1, float x2, float y2) 3013void glRect (float x1, float y1, float x2, float y2)
2697 CODE: 3014 CODE:
2698 glRectf (x1, y1, x2, y2); 3015 glRectf (x1, y1, x2, y2);
2699 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
2700PROTOTYPES: ENABLE 3026PROTOTYPES: ENABLE
2701 3027
2702void glBegin (int mode) 3028void glBegin (int mode)
2703 3029
2704void glEnd () 3030void glEnd ()
2736void 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)
2737 CODE: 3063 CODE:
2738 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2739 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2740 3066
2741void 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)
2742 3068
2743void 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)
2744 3070
2745void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2746 3072
2772 3098
2773void glEndList () 3099void glEndList ()
2774 3100
2775void glCallList (int list) 3101void glCallList (int list)
2776 3102
2777MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2778 3104
2779PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2780 3106
2781void 3107void
2782find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2786 XPUSHs (self); 3112 XPUSHs (self);
2787} 3113}
2788 3114
2789BOOT: 3115BOOT:
2790{ 3116{
2791 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2792 3118
2793 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);
2794 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);
2795 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);
2796 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);
2797} 3123}
2798 3124
2799void 3125void
2800draw (SV *self) 3126draw (SV *self)
2801 CODE: 3127 CODE:
2805 NV x, y, w, h; 3131 NV x, y, w, h;
2806 SV *draw_x_sv = GvSV (draw_x_gv); 3132 SV *draw_x_sv = GvSV (draw_x_gv);
2807 SV *draw_y_sv = GvSV (draw_y_gv); 3133 SV *draw_y_sv = GvSV (draw_y_gv);
2808 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2809 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2810 SV *hover;
2811 double draw_x, draw_y, draw_w, draw_h; 3136 double draw_x, draw_y;
2812 3137
2813 if (!SvROK (self)) 3138 if (!SvROK (self))
2814 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2815 3140
2816 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2817 3142
2818 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2819 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2820 3145
2821 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.;
2822 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.;
2823 3148
2824 if (!h || !w) 3149 if (!h || !w)
2844 { 3169 {
2845 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3170 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2846 3171
2847 if (svp && SvTRUE (*svp)) 3172 if (svp && SvTRUE (*svp))
2848 { 3173 {
2849 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);
2850 glEnable (GL_BLEND); 3175 glEnable (GL_BLEND);
2851 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3176 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2852 glBegin (GL_QUADS); 3177 glBegin (GL_QUADS);
2853 glVertex2f (0, 0); 3178 glVertex2f (0, 0);
2854 glVertex2f (w, 0); 3179 glVertex2f (w, 0);
2857 glEnd (); 3182 glEnd ();
2858 glDisable (GL_BLEND); 3183 glDisable (GL_BLEND);
2859 } 3184 }
2860 } 3185 }
2861#if 0 3186#if 0
2862 if ($ENV{CFPLUS_DEBUG} & 1) { 3187 // draw borders, for debugging
2863 glPushMatrix; 3188 glPushMatrix ();
2864 glColor 1, 1, 0, 1; 3189 glColor4f (1., 1., 0., 1.);
2865 glTranslate 0.375, 0.375; 3190 glTranslatef (.5, .5, 0.);
2866 glBegin GL_LINE_LOOP; 3191 glBegin (GL_LINE_LOOP);
2867 glVertex 0 , 0; 3192 glVertex2f (0 , 0);
2868 glVertex $self->{w} - 1, 0; 3193 glVertex2f (w - 1, 0);
2869 glVertex $self->{w} - 1, $self->{h} - 1; 3194 glVertex2f (w - 1, h - 1);
2870 glVertex 0 , $self->{h} - 1; 3195 glVertex2f (0 , h - 1);
2871 glEnd; 3196 glEnd ();
2872 glPopMatrix; 3197 glPopMatrix ();
2873 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2874 }
2875#endif 3198#endif
2876 PUSHMARK (SP); 3199 PUSHMARK (SP);
2877 XPUSHs (self); 3200 XPUSHs (self);
2878 PUTBACK; 3201 PUTBACK;
2879 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