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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.273 by root, Wed Aug 20 13:30:02 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>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
34#include <SDL_mixer.h> 41#include <SDL_mixer.h>
35#include <SDL_opengl.h> 42#include <SDL_opengl.h>
36 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
37#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
39 51
40#include <glib/gmacros.h> 52#include <glib/gmacros.h>
41 53
42#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
43 66
44#ifndef _WIN32 67#ifndef _WIN32
45# include <sys/types.h> 68# include <sys/types.h>
46# include <sys/socket.h> 69# include <sys/socket.h>
47# include <netinet/in.h> 70# include <netinet/in.h>
48# include <netinet/tcp.h> 71# include <netinet/tcp.h>
49# include <inttypes.h> 72# include <inttypes.h>
50#endif 73#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 85
54#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
55 87
56#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
58 90
59#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
60 92
61#if 0 93/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else
64# define PARACHUTE 0
65#endif
66 95
67static AV *texture_av; 96static AV *texture_av;
68 97
69static struct 98static struct
70{ 99{
107 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
109} 138}
110 139
111#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
112 142
113#include "pango-font.c" 143#include "pango-font.c"
114#include "pango-fontmap.c" 144#include "pango-fontmap.c"
115#include "pango-render.c" 145#include "pango-render.c"
116 146
147typedef IV DC__Channel;
148typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
119 151
120typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
121 153
122static int 154static int
123shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
124{ 156{
125 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
139 171
140typedef struct cf_layout { 172typedef struct cf_layout {
141 PangoLayout *pl; 173 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
143 int base_height; 175 int base_height;
144 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
145} *CFPlus__Layout; 178} *DC__Layout;
146 179
147static CFPlus__Font default_font; 180static DC__Font default_font;
148static PangoContext *opengl_context; 181static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
150 183
151static void 184static void
152substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
157#endif 190#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 192}
160 193
161static void 194static void
162layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
163{ 196{
164 /* 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
165 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
166 */ 199 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
168 201
169 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 204
172 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
173} 206}
174 207
175static void 208static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 210{
178 PangoRectangle rect; 211 PangoRectangle rect;
179 212
180 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
192 225
193typedef uint16_t tileid; 226typedef uint16_t tileid;
194typedef uint16_t faceid; 227typedef uint16_t faceid;
195 228
196typedef struct { 229typedef struct {
197 int name; 230 GLuint name;
198 int w, h; 231 int w, h;
199 float s, t; 232 float s, t;
200 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
201 tileid smoothtile; 234 tileid smoothtile;
202 uint8_t smoothlevel; 235 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
222 255
223 int32_t rows; 256 int32_t rows;
224 maprow *row; 257 maprow *row;
225} *CFPlus__Map; 258} *DC__Map;
226 259
227static char * 260static char *
228prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
229{ 262{
230 char *p; 263 char *p;
268 self->texs *= 2; 301 self->texs *= 2;
269 } 302 }
270} 303}
271 304
272static maprow * 305static maprow *
273map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
274{ 307{
275 if (0 > y) 308 if (0 > y)
276 { 309 {
277 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
316 349
317 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
318} 351}
319 352
320static mapcell * 353static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
322{ 355{
323 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
324} 357}
325 358
326static void 359static void
327map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
328{ 361{
329 int r; 362 int r;
330 363
331 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
339 self->oy = 0; 372 self->oy = 0;
340 self->row = 0; 373 self->row = 0;
341 self->rows = 0; 374 self->rows = 0;
342} 375}
343 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
344static void 387static void
345map_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)
346{ 389{
347 int x, y; 390 int x, y;
348 maprow *row; 391 maprow *row;
349 mapcell *cell; 392 mapcell *cell;
350 393
362 if (x >= row->c1) 405 if (x >= row->c1)
363 break; 406 break;
364 407
365 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
366 409
367 cell->darkness = 0; 410 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 411 }
372 } 412 }
373} 413}
374 414
375typedef struct { 415typedef struct {
429 n |= n >> 16; 469 n |= n >> 16;
430 470
431 return n + 1; 471 return n + 1;
432} 472}
433 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
434/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
437 488
438/******************************************************************************/ 489/******************************************************************************/
476 return 0; 527 return 0;
477 528
478 return 1; 529 return 1;
479} 530}
480 531
481MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538}
539
540#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back.
546 */
547 extern C_LINKAGE int
548 main (int argc, char *argv[])
549 {
550 deliantra_main ();
551 }
552
553 #undef main
554
555 extern C_LINKAGE int main (int argc, char *argv[]);
556
557 static void
558 SDL_braino (void)
559 {
560 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv);
562 }
563#else
564 static void
565 SDL_braino (void)
566 {
567 deliantra_main ();
568 }
569#endif
570
571MODULE = Deliantra::Client PACKAGE = DC
482 572
483PROTOTYPES: ENABLE 573PROTOTYPES: ENABLE
484 574
485BOOT: 575BOOT:
486{ 576{
487 HV *stash = gv_stashpv ("CFPlus", 1); 577 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 578 static const struct {
489 const char *name; 579 const char *name;
490 IV iv; 580 IV iv;
491 } *civ, const_iv[] = { 581 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 582# define const_iv(name) { # name, (IV)name }
514 604
515 const_iv (SDL_APPINPUTFOCUS), 605 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 606 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 607 const_iv (SDL_APPACTIVE),
518 608
609 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 611 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 612 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 613 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 614 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 615 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 687 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 688 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 689 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 690 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 691 const_iv (KMOD_MODE),
692
693 const_iv (MIX_DEFAULT_FORMAT),
694
695 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO),
698 const_iv (SDL_INIT_CDROM),
699 const_iv (SDL_INIT_JOYSTICK),
700 const_iv (SDL_INIT_EVERYTHING),
701 const_iv (SDL_INIT_NOPARACHUTE),
702 const_iv (SDL_INIT_EVENTTHREAD),
703
704 const_iv (SDL_GL_RED_SIZE),
705 const_iv (SDL_GL_GREEN_SIZE),
706 const_iv (SDL_GL_BLUE_SIZE),
707 const_iv (SDL_GL_ALPHA_SIZE),
708 const_iv (SDL_GL_DOUBLEBUFFER),
709 const_iv (SDL_GL_BUFFER_SIZE),
710 const_iv (SDL_GL_DEPTH_SIZE),
711 const_iv (SDL_GL_STENCIL_SIZE),
712 const_iv (SDL_GL_ACCUM_RED_SIZE),
713 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
714 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
715 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
716 const_iv (SDL_GL_STEREO),
717 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
718 const_iv (SDL_GL_MULTISAMPLESAMPLES),
719 const_iv (SDL_GL_ACCELERATED_VISUAL),
720 const_iv (SDL_GL_SWAP_CONTROL),
721
722 const_iv (FOW_DARKNESS)
600# undef const_iv 723# undef const_iv
601 }; 724 };
602 725
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 745
623NV floor (NV x) 746NV floor (NV x)
624 747
625NV ceil (NV x) 748NV ceil (NV x)
626 749
750IV minpot (UV n)
751
752IV popcount (UV n)
753
627void 754void
628pango_init () 755pango_init ()
629 CODE: 756 CODE:
630{ 757{
631 opengl_fontmap = pango_opengl_font_map_new (); 758 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 759 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 760 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
761 /*pango_context_set_font_description (opengl_context, default_font);*/
762#if PANGO_VERSION_CHECK (1, 15, 2)
763 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
764 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
765#endif
634} 766}
635 767
636char *
637SDL_GetError () 768char *SDL_GetError ()
638 769
639int 770void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 771
642void 772int SDL_Init (U32 flags)
773
774int SDL_InitSubSystem (U32 flags)
775
776void SDL_QuitSubSystem (U32 flags)
777
643SDL_Quit () 778void SDL_Quit ()
779
780int SDL_GL_SetAttribute (int attr, int value)
781
782int SDL_GL_GetAttribute (int attr)
783 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL))
785 XSRETURN_UNDEF;
786 OUTPUT:
787 RETVAL
644 788
645void 789void
646SDL_ListModes (int rgb, int alpha) 790SDL_ListModes (int rgb, int alpha)
647 PPCODE: 791 PPCODE:
648{ 792{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 806 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 807
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 808 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 809 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 810
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 811 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 812
672 if (m && m != (SDL_Rect **)-1) 813 if (m && m != (SDL_Rect **)-1)
673 while (*m) 814 while (*m)
674 { 815 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 816 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 817 {
677 AV *av = newAV (); 818 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 819 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 820 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 821 av_push (av, newSViv (rgb));
704 845
705 if (RETVAL) 846 if (RETVAL)
706 { 847 {
707 av_clear (texture_av); 848 av_clear (texture_av);
708 849
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 850 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 851#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 852#include "glfunc.h"
712#undef GL_FUNC 853#undef GL_FUNC
713 } 854 }
714} 855}
721char * 862char *
722SDL_GetKeyName (int sym) 863SDL_GetKeyName (int sym)
723 864
724int 865int
725SDL_GetAppState () 866SDL_GetAppState ()
867
868int
869SDL_GetModState ()
726 870
727void 871void
728poll_events () 872poll_events ()
729 PPCODE: 873 PPCODE:
730{ 874{
740 { 884 {
741 case SDL_KEYDOWN: 885 case SDL_KEYDOWN:
742 case SDL_KEYUP: 886 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 889 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 890 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 892 break;
749 893
750 case SDL_ACTIVEEVENT: 894 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 913 x = ev.motion.x;
770 y = ev.motion.y; 914 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 916 }
773 917
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 919 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 920 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 921 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 922 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 923 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 924 }
781 break; 925 break;
782 926
783 case SDL_MOUSEBUTTONDOWN: 927 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 928 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 929 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 930
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 931 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 932 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 933 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 934 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 939 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 940 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 941 break;
798 } 942 }
799 943
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 945 }
802} 946}
803 947
804int 948int
805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 950 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 951 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 952 Mix_ChannelFinished (channel_finished);
809 953
810void 954void
955Mix_QuerySpec ()
956 PPCODE:
957{
958 int freq, channels;
959 Uint16 format;
960
961 if (Mix_QuerySpec (&freq, &format, &channels))
962 {
963 EXTEND (SP, 3);
964 PUSHs (sv_2mortal (newSViv (freq)));
965 PUSHs (sv_2mortal (newSViv (format)));
966 PUSHs (sv_2mortal (newSViv (channels)));
967 }
968}
969
970void
811Mix_CloseAudio () 971Mix_CloseAudio ()
812 972
813int 973int
814Mix_AllocateChannels (int numchans = -1) 974Mix_AllocateChannels (int numchans = -1)
975
976const char *
977Mix_GetError ()
815 978
816void 979void
817lowdelay (int fd, int val = 1) 980lowdelay (int fd, int val = 1)
818 CODE: 981 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 982 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1008 }
846 } 1009 }
847#endif 1010#endif
848} 1011}
849 1012
850void 1013int
851add_font (char *file) 1014add_font (char *file)
852 CODE: 1015 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT:
1018 RETVAL
854 1019
855void 1020void
856load_image_inline (SV *image_) 1021load_image_inline (SV *image_)
857 ALIAS: 1022 ALIAS:
858 load_image_file = 1 1023 load_image_file = 1
861 STRLEN image_len; 1026 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1027 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1028 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1029 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1030 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1031 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1032 : SDL_RWFromConstMem (image, image_len);
868 1033
869 if (!rw) 1034 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1035 croak ("load_image: %s", SDL_GetError ());
871 1036
944void 1109void
945error (char *message) 1110error (char *message)
946 CODE: 1111 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1112 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1113#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1114 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1115#endif
951 1116
952void 1117void
953fatal (char *message) 1118fatal (char *message)
954 CODE: 1119 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1120 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1121#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1122 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1123#endif
959 _exit (1); 1124 _exit (1);
960 1125
961void 1126void
962_exit (int retval = 0) 1127_exit (int retval = 0)
974#if DEBUG 1139#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1140 VALGRIND_DO_LEAK_CHECK;
976#endif 1141#endif
977} 1142}
978 1143
979MODULE = CFPlus PACKAGE = CFPlus::Font 1144MODULE = Deliantra::Client PACKAGE = DC::Font
980 1145
981PROTOTYPES: DISABLE 1146PROTOTYPES: DISABLE
982 1147
983CFPlus::Font 1148DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1149new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1150 CODE:
986{ 1151{
987 int count; 1152 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1156}
992 OUTPUT: 1157 OUTPUT:
993 RETVAL 1158 RETVAL
994 1159
995void 1160void
996DESTROY (CFPlus::Font self) 1161DESTROY (DC::Font self)
997 CODE: 1162 CODE:
998 pango_font_description_free (self); 1163 pango_font_description_free (self);
999 1164
1000void 1165void
1001make_default (CFPlus::Font self) 1166make_default (DC::Font self)
1002 PROTOTYPE: $ 1167 PROTOTYPE: $
1003 CODE: 1168 CODE:
1004 default_font = self; 1169 default_font = self;
1005 1170
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1171MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1172
1008PROTOTYPES: DISABLE 1173PROTOTYPES: DISABLE
1009 1174
1010void 1175void
1011reset_glyph_cache () 1176glyph_cache_backup ()
1012 PROTOTYPE: 1177 PROTOTYPE:
1013 CODE: 1178 CODE:
1179 tc_backup ();
1180
1181void
1182glyph_cache_restore ()
1183 PROTOTYPE:
1184 CODE:
1014 tc_clear (); 1185 tc_restore ();
1015 1186
1016CFPlus::Layout 1187DC::Layout
1017new (SV *class) 1188new (SV *class)
1018 CODE: 1189 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1190 New (0, RETVAL, 1, struct cf_layout);
1020 1191
1021 RETVAL->pl = pango_layout_new (opengl_context); 1192 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1194 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1195 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1196 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1197 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1198 RETVAL->font = 0;
1199 RETVAL->rc = rc_alloc ();
1028 1200
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1201 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1202 layout_update_font (RETVAL);
1031 OUTPUT: 1203 OUTPUT:
1032 RETVAL 1204 RETVAL
1033 1205
1034void 1206void
1035DESTROY (CFPlus::Layout self) 1207DESTROY (DC::Layout self)
1036 CODE: 1208 CODE:
1037 g_object_unref (self->pl); 1209 g_object_unref (self->pl);
1210 rc_free (self->rc);
1038 Safefree (self); 1211 Safefree (self);
1039 1212
1040void 1213void
1041set_text (CFPlus::Layout self, SV *text_) 1214set_text (DC::Layout self, SV *text_)
1042 CODE: 1215 CODE:
1043{ 1216{
1044 STRLEN textlen; 1217 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1218 char *text = SvPVutf8 (text_, textlen);
1046 1219
1047 pango_layout_set_text (self->pl, text, textlen); 1220 pango_layout_set_text (self->pl, text, textlen);
1048} 1221}
1049 1222
1050void 1223void
1051set_markup (CFPlus::Layout self, SV *text_) 1224set_markup (DC::Layout self, SV *text_)
1052 CODE: 1225 CODE:
1053{ 1226{
1054 STRLEN textlen; 1227 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1228 char *text = SvPVutf8 (text_, textlen);
1056 1229
1057 pango_layout_set_markup (self->pl, text, textlen); 1230 pango_layout_set_markup (self->pl, text, textlen);
1058} 1231}
1059 1232
1060void 1233void
1061set_shapes (CFPlus::Layout self, ...) 1234set_shapes (DC::Layout self, ...)
1062 CODE: 1235 CODE:
1063{ 1236{
1064 PangoAttrList *attrs = 0; 1237 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1238 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1239 const char *pos = text;
1101 if (attrs) 1274 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1275 pango_layout_set_attributes (self->pl, attrs);
1103} 1276}
1104 1277
1105void 1278void
1106get_shapes (CFPlus::Layout self) 1279get_shapes (DC::Layout self)
1107 PPCODE: 1280 PPCODE:
1108{ 1281{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1282 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1283
1111 do 1284 do
1112 { 1285 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1286 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1287
1115 if (run && shape_attr_p (run)) 1288 if (run && shape_attr_p (run))
1116 { 1289 {
1117 PangoRectangle extents; 1290 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1291 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1299
1127 pango_layout_iter_free (iter); 1300 pango_layout_iter_free (iter);
1128} 1301}
1129 1302
1130int 1303int
1131has_wrapped (CFPlus::Layout self) 1304has_wrapped (DC::Layout self)
1132 CODE: 1305 CODE:
1133{ 1306{
1134 int lines = 1; 1307 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1308 const char *text = pango_layout_get_text (self->pl);
1136 1309
1141} 1314}
1142 OUTPUT: 1315 OUTPUT:
1143 RETVAL 1316 RETVAL
1144 1317
1145SV * 1318SV *
1146get_text (CFPlus::Layout self) 1319get_text (DC::Layout self)
1147 CODE: 1320 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1321 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1322 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1323 OUTPUT:
1151 RETVAL 1324 RETVAL
1152 1325
1153void 1326void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1327set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1328 CODE:
1156 self->r = r; 1329 self->r = r;
1157 self->g = g; 1330 self->g = g;
1158 self->b = b; 1331 self->b = b;
1159 self->a = a; 1332 self->a = a;
1160 1333
1161void 1334void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1335set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1336 CODE:
1164 if (self->font != font) 1337 if (self->font != font)
1165 { 1338 {
1166 self->font = font; 1339 self->font = font;
1167 layout_update_font (self); 1340 layout_update_font (self);
1168 } 1341 }
1169 1342
1170void 1343void
1171set_height (CFPlus::Layout self, int base_height) 1344set_height (DC::Layout self, int base_height)
1172 CODE: 1345 CODE:
1173 if (self->base_height != base_height) 1346 if (self->base_height != base_height)
1174 { 1347 {
1175 self->base_height = base_height; 1348 self->base_height = base_height;
1176 layout_update_font (self); 1349 layout_update_font (self);
1177 } 1350 }
1178 1351
1179void 1352void
1180set_width (CFPlus::Layout self, int max_width = -1) 1353set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1354 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1355 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1356
1184void 1357void
1185set_indent (CFPlus::Layout self, int indent) 1358set_indent (DC::Layout self, int indent)
1186 CODE: 1359 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1360 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1361
1189void 1362void
1190set_spacing (CFPlus::Layout self, int spacing) 1363set_spacing (DC::Layout self, int spacing)
1191 CODE: 1364 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1365 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1366
1194void 1367void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1368set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1369 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1370 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1371 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1372 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1373 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1374 : PANGO_ELLIPSIZE_NONE
1202 ); 1375 );
1203 1376
1204void 1377void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1378set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1379 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1380 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1381
1209void 1382void
1210size (CFPlus::Layout self) 1383size (DC::Layout self)
1211 PPCODE: 1384 PPCODE:
1212{ 1385{
1213 int w, h; 1386 int w, h;
1214 1387
1215 layout_get_pixel_size (self, &w, &h); 1388 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1391 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1392 PUSHs (sv_2mortal (newSViv (h)));
1220} 1393}
1221 1394
1222int 1395int
1223descent (CFPlus::Layout self) 1396descent (DC::Layout self)
1224 CODE: 1397 CODE:
1225{ 1398{
1226 PangoRectangle rect; 1399 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1400 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1401 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1402 RETVAL = PANGO_DESCENT (rect);
1230} 1403}
1231 OUTPUT: 1404 OUTPUT:
1232 RETVAL 1405 RETVAL
1233 1406
1234int 1407int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1408xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1409 CODE:
1237{ 1410{
1238 int index, trailing; 1411 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1412 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1413 RETVAL = index + trailing;
1241} 1414}
1242 OUTPUT: 1415 OUTPUT:
1243 RETVAL 1416 RETVAL
1244 1417
1245void 1418void
1246cursor_pos (CFPlus::Layout self, int index) 1419cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1420 PPCODE:
1248{ 1421{
1249 PangoRectangle strong_pos; 1422 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1423 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1424
1252 EXTEND (SP, 3); 1425 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1428 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1429}
1257 1430
1258void 1431void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1432index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1433 PPCODE:
1261{ 1434{
1262 int line, x; 1435 int line, x;
1263 1436
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1437 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1438#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1439 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1440 --line;
1441#endif
1267 EXTEND (SP, 2); 1442 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1443 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1444 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1445}
1271 1446
1272void 1447void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1448line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1449 PPCODE:
1275{ 1450{
1276 PangoLayoutLine *lp; 1451 PangoLayoutLine *lp;
1277 int index, trailing; 1452 int index, trailing;
1278 1453
1279 if (line < 0) 1454 if (line < 0)
1280 XSRETURN_EMPTY; 1455 XSRETURN_EMPTY;
1281 1456
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1457 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1458 XSRETURN_EMPTY; /* do better */
1284 1459
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1460 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1461
1287 EXTEND (SP, 2); 1462 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1468 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1469 }
1295} 1470}
1296 1471
1297void 1472void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1473render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1474 CODE:
1475 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1476 pango_opengl_render_layout_subpixel (
1301 self->pl, 1477 self->pl,
1478 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1479 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1480 self->r, self->g, self->b, self->a,
1304 flags 1481 flags
1305 ); 1482 );
1483 // we assume that context_change actually clears/frees stuff
1484 // and does not do any recomputation...
1485 pango_layout_context_changed (self->pl);
1306 1486
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1487void
1488draw (DC::Layout self)
1489 CODE:
1490{
1491 glEnable (GL_TEXTURE_2D);
1492 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1493 glEnable (GL_BLEND);
1494 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1495 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1496 glEnable (GL_ALPHA_TEST);
1497 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1498
1499 rc_draw (self->rc);
1500
1501 glDisable (GL_ALPHA_TEST);
1502 glDisable (GL_BLEND);
1503 glDisable (GL_TEXTURE_2D);
1504}
1505
1506MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1507
1309PROTOTYPES: ENABLE 1508PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1509
1313void 1510void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1511pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1512 CODE:
1316{ 1513{
1343 HV *hv = (HV *)SvRV (self); 1540 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1541 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1542 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1543 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1544
1545 if (name <= 0)
1546 XSRETURN_EMPTY;
1547
1348 if (items < 5) 1548 if (items < 5)
1349 { 1549 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1550 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1551 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1552 }
1390 RETVAL = width > 0; 1590 RETVAL = width > 0;
1391} 1591}
1392 OUTPUT: 1592 OUTPUT:
1393 RETVAL 1593 RETVAL
1394 1594
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1595MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1596
1397PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1398 1598
1399CFPlus::Map 1599DC::Map
1400new (SV *class) 1600new (SV *class)
1401 CODE: 1601 CODE:
1402 New (0, RETVAL, 1, struct map); 1602 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1603 RETVAL->x = 0;
1404 RETVAL->y = 0; 1604 RETVAL->y = 0;
1412 RETVAL->row = 0; 1612 RETVAL->row = 0;
1413 OUTPUT: 1613 OUTPUT:
1414 RETVAL 1614 RETVAL
1415 1615
1416void 1616void
1417DESTROY (CFPlus::Map self) 1617DESTROY (DC::Map self)
1418 CODE: 1618 CODE:
1419{ 1619{
1420 map_clear (self); 1620 map_clear (self);
1421 Safefree (self->face2tile); 1621 Safefree (self->face2tile);
1422 Safefree (self->tex); 1622 Safefree (self->tex);
1423 Safefree (self); 1623 Safefree (self);
1424} 1624}
1425 1625
1426void 1626void
1427resize (CFPlus::Map self, int map_width, int map_height) 1627resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1628 CODE:
1429 self->w = map_width; 1629 self->w = map_width;
1430 self->h = map_height; 1630 self->h = map_height;
1431 1631
1432void 1632void
1433clear (CFPlus::Map self) 1633clear (DC::Map self)
1434 CODE: 1634 CODE:
1435 map_clear (self); 1635 map_clear (self);
1436 1636
1437void 1637void
1438set_tileid (CFPlus::Map self, int face, int tile) 1638set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1639 CODE:
1440{ 1640{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1641 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1642 need_texid (self, tile);
1443} 1643}
1444 1644
1445void 1645void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1646set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1647 CODE:
1448{ 1648{
1449 tileid texid; 1649 tileid texid;
1450 maptex *tex; 1650 maptex *tex;
1451 1651
1464 tex->smoothtile = self->face2tile [smooth]; 1664 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1665 tex->smoothlevel = level;
1466} 1666}
1467 1667
1468void 1668void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1669set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1670 CODE:
1471{ 1671{
1472 need_texid (self, texid); 1672 need_texid (self, texid);
1473 1673
1474 { 1674 {
1494 // from transparent color bleeding and ugly wrapping effects. 1694 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1696}
1497 1697
1498int 1698int
1499ox (CFPlus::Map self) 1699ox (DC::Map self)
1500 ALIAS: 1700 ALIAS:
1501 oy = 1 1701 oy = 1
1502 x = 2 1702 x = 2
1503 y = 3 1703 y = 3
1504 w = 4 1704 w = 4
1515 } 1715 }
1516 OUTPUT: 1716 OUTPUT:
1517 RETVAL 1717 RETVAL
1518 1718
1519void 1719void
1520scroll (CFPlus::Map self, int dx, int dy) 1720scroll (DC::Map self, int dx, int dy)
1521 CODE: 1721 CODE:
1522{ 1722{
1523 if (dx > 0) 1723 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1724 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1725 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1740 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1741 self->y += MAP_EXTEND_Y;
1542 } 1742 }
1543} 1743}
1544 1744
1545void 1745SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1746map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1747 CODE:
1548{ 1748{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1750 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1751 mapcell *cell;
1552 int x, y, flags; 1752 int x, y, z, flags;
1753 AV *missing = newAV ();
1754 RETVAL = newRV_noinc ((SV *)missing);
1553 1755
1554 while (data < data_end - 1) 1756 while (data < data_end - 1)
1555 { 1757 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1758 flags = (data [0] << 8) + data [1]; data += 2;
1557 1759
1577 uint8_t ext, cmd; 1779 uint8_t ext, cmd;
1578 1780
1579 do 1781 do
1580 { 1782 {
1581 ext = *data++; 1783 ext = *data++;
1582 cmd = ext & 0x3f; 1784 cmd = ext & 0x7f;
1583 1785
1584 if (cmd < 4) 1786 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1787 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1788 else if (cmd == 5) // health
1587 { 1789 {
1590 } 1792 }
1591 else if (cmd == 6) // monster width 1793 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1794 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1795 else if (cmd == 0x47)
1594 { 1796 {
1595 if (*data == 4) 1797 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1801
1598 data += *data + 1; 1802 data += *data + 1;
1599 } 1803 }
1600 else if (cmd == 8) // cell flags 1804 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1805 cell->flags = *data++;
1608 } 1812 }
1609 else 1813 else
1610 cell->darkness = *data++ + 1; 1814 cell->darkness = *data++ + 1;
1611 } 1815 }
1612 1816
1817 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1818 if (flags & (4 >> z))
1614 { 1819 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1820 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1821 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1822 cell->tile [z] = self->face2tile [face];
1823
1824 if (cell->tile [z])
1825 {
1826 maptex *tex = self->tex + cell->tile [z];
1827 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z]));
1829
1830 if (tex->smoothtile)
1831 {
1832 maptex *smooth = self->tex + tex->smoothtile;
1833 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile));
1835 }
1836 }
1618 } 1837 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1838 }
1634 else 1839 else
1635 cell->darkness = 0; 1840 CELL_CLEAR (cell);
1636 } 1841 }
1637} 1842}
1843 OUTPUT:
1844 RETVAL
1638 1845
1639SV * 1846SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1847mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1848 CODE:
1642{ 1849{
1643 int x1, x; 1850 int x1, x;
1644 int y1, y; 1851 int y1, y;
1645 int z; 1852 int z;
1690} 1897}
1691 OUTPUT: 1898 OUTPUT:
1692 RETVAL 1899 RETVAL
1693 1900
1694void 1901void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 1903 CODE:
1697{ 1904{
1905 int x, y, z;
1906
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1910 smooth_key skey;
1702 int x, y, z; 1911 int pl_x, pl_y;
1703 int last_name; 1912 maptex pl_tex;
1913 rc_t *rc = rc_alloc ();
1914 rc_key_t key;
1915 rc_array_t *arr;
1916
1917 pl_tex.name = 0;
1704 1918
1705 // thats current max. sorry. 1919 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1920 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1921 if (sh > 255) sh = 255;
1708 1922
1709 // clear key, in case of extra padding 1923 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1924 memset (&skey, 0, sizeof (skey));
1711 1925
1712 glColor4ub (255, 255, 255, 255); 1926 memset (&key, 0, sizeof (key));
1713 1927 key.r = 255;
1714 glEnable (GL_BLEND); 1928 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1929 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1930 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1931 key.mode = GL_QUADS;
1718 1932 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1933 key.texname = -1;
1720
1721 last_name = 0;
1722 1934
1723 mx += self->x; 1935 mx += self->x;
1724 my += self->y; 1936 my += self->y;
1725 1937
1726 // first pass: determine smooth_max 1938 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1954 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1955 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1956 self->tex [cell->tile [2]].smoothlevel));
1745 } 1957 }
1746 } 1958 }
1959
1960 glEnable (GL_BLEND);
1961 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1963
1748 for (z = 0; z <= 2; z++) 1964 for (z = 0; z <= 2; z++)
1749 { 1965 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1966 memset (smooth_level, 0, sizeof (smooth_level));
1751 1967
1764 { 1980 {
1765 maptex tex = self->tex [tile]; 1981 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1982 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1983 int py = (y + 1) * T - tex.h;
1768 1984
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1985 if (key.texname != tex.name)
1772 { 1986 {
1773 if (!tex.name) 1987 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1988 tex = self->tex [2]; /* missing, replace by noface */
1775 1989
1776 glEnd (); 1990 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1991 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1992 }
1780 1993
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1994 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 1995 {
1996 pl_x = px;
1997 pl_y = py;
1998 pl_tex = tex;
1999 continue;
2000 }
2001
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2006
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 2010 if (cell->flags & 1)
1789 { 2011 {
1790 maptex tex = self->tex [1]; 2012 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 2013 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 2014 int py = y * T - T * 6 / 32;
1793 2015
2016 if (tex.name)
1794 glEnd (); 2017 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 2028 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 2029 }
1803 } 2030 }
1804 2031
1805 // update smooth hash 2032 // update smooth hash
1806 if (tex.smoothtile) 2033 if (tex.smoothtile)
1842 } 2069 }
1843 } 2070 }
1844 } 2071 }
1845 } 2072 }
1846 2073
2074 rc_draw (rc);
2075 rc_clear (rc);
2076
1847 // go through all smoothlevels, lowest to highest, then draw. 2077 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2078 // this is basically counting sort
1849 { 2079 {
1850 int w, b; 2080 int w, b;
1851 2081
2082 glEnable (GL_TEXTURE_2D);
2083 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2084 for (w = 0; w < 256 / 32; ++w)
1853 { 2085 {
1854 uint32_t smask = smooth_level [w]; 2086 uint32_t smask = smooth_level [w];
1855 if (smask) 2087 if (smask)
1856 for (b = 0; b < 32; ++b) 2088 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2107 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2108 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2109 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2110 float dy = tex.t * .5f ; // 2 images/column
1879 2111
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2112 if (tex.name)
1883 { 2113 {
2114 // this time avoiding texture state changes
2115 // save gobs of state changes.
1884 if (!tex.name) 2116 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2117 {
1886
1887 glEnd (); 2118 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2120 glBegin (GL_QUADS);
1890 } 2121 }
1891 2122
1892 if (border) 2123 if (border)
1893 { 2124 {
1894 float ox = border * dx; 2125 float ox = border * dx;
1895 2126
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2131 }
1901 2132
1902 if (corner) 2133 if (corner)
1903 { 2134 {
1904 float ox = corner * dx; 2135 float ox = corner * dx;
1905 2136
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2137 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2141 }
1910 } 2142 }
1911 } 2143 }
1912 } 2144 }
1913 } 2145 }
1914 } 2146 }
2147
2148 glEnd ();
2149 glDisable (GL_TEXTURE_2D);
2150 key.texname = -1;
1915 } 2151 }
1916 2152
1917 hv_clear (smooth); 2153 hv_clear (smooth);
1918 } 2154 }
1919 2155
1920 glEnd (); 2156 if (pl_tex.name)
2157 {
2158 maptex tex = pl_tex;
2159 int px = pl_x + sdx;
2160 int py = pl_y + sdy;
1921 2161
1922 glDisable (GL_TEXTURE_2D); 2162 key.texname = tex.name;
2163 arr = rc_array (rc, &key);
2164
2165 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169
2170 rc_draw (rc);
2171 }
2172
1923 glDisable (GL_BLEND); 2173 glDisable (GL_BLEND);
2174 rc_free (rc);
1924 2175
1925 // top layer: overlays such as the health bar 2176 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2177 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2178 if (0 <= y + my && y + my < self->rows)
1928 { 2179 {
1953 } 2204 }
1954 } 2205 }
1955} 2206}
1956 2207
1957void 2208void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2210 CODE:
1960{ 2211{
1961 static float color[16][3] = { 2212 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2213 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2214 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2264 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2265 glDisable (GL_TEXTURE_2D);
2015} 2266}
2016 2267
2017void 2268void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2269fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2270 PPCODE:
2020{ 2271{
2021 int x, y; 2272 int x, y;
2022 int sw1 = sw + 2; 2273 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2274 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2282 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2283
2033 mx += self->x - 1; 2284 mx += self->x - 1;
2034 my += self->y - 1; 2285 my += self->y - 1;
2035 2286
2036 memset (darkness1, 255, sw1 * sh1); 2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2288
2038 for (y = 0; y < sh1; y++) 2289 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2290 if (0 <= y + my && y + my < self->rows)
2040 { 2291 {
2041 maprow *row = self->row + (y + my); 2292 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2345 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2346 PUSHs (darkness3_sv);
2096} 2347}
2097 2348
2098SV * 2349SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2350get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2351 CODE:
2101{ 2352{
2102 int x, y, x1, y1; 2353 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2354 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2355 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2412 else
2162 *data++ = 0; 2413 *data++ = 0;
2163 } 2414 }
2164 } 2415 }
2165 2416
2417 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 {
2166 SvPOK_only (data_sv); 2420 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 }
2423
2168 RETVAL = data_sv; 2424 RETVAL = data_sv;
2169} 2425}
2170 OUTPUT: 2426 OUTPUT:
2171 RETVAL 2427 RETVAL
2172 2428
2173void 2429void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2430set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2431 PPCODE:
2176{ 2432{
2177 int x, y, z; 2433 int x, y, z;
2178 int w, h; 2434 int w, h;
2179 int x1, y1; 2435 int x1, y1;
2436 STRLEN len;
2437 uint8_t *data, *end;
2438
2439 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv);
2442 end = data + len + 8;
2443
2444 if (len < 5)
2445 XSRETURN_EMPTY;
2180 2446
2181 if (*data++ != 0) 2447 if (*data++ != 0)
2182 return; /* version mismatch */ 2448 XSRETURN_EMPTY; /* version mismatch */
2183 2449
2184 w = *data++ << 8; w |= *data++; 2450 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2451 h = *data++ << 8; h |= *data++;
2186 2452
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2453 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2465 {
2200 maprow *row = map_get_row (self, y); 2466 maprow *row = map_get_row (self, y);
2201 2467
2202 for (x = x0; x < x1; x++) 2468 for (x = x0; x < x1; x++)
2203 { 2469 {
2470 uint8_t flags;
2471
2472 if (data + 7 >= end)
2473 XSRETURN_EMPTY;
2474
2204 uint8_t flags = *data++; 2475 flags = *data++;
2205 2476
2206 if (flags) 2477 if (flags)
2207 { 2478 {
2208 mapcell *cell = row_get_cell (row, x); 2479 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2480 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2483 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2484 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2485
2215 if (cell->darkness == 0) 2486 if (cell->darkness == 0)
2216 { 2487 {
2217 cell->darkness = 0; 2488 /*cell->darkness = 0;*/
2489 EXTEND (SP, 3);
2218 2490
2219 for (z = 0; z <= 2; z++) 2491 for (z = 0; z <= 2; z++)
2220 { 2492 {
2221 tileid t = tile [z]; 2493 tileid t = tile [z];
2222 2494
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2495 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2496 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2497 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2498 need_texid (self, t);
2227 } 2499 }
2228 2500
2229 cell->tile [z] = t; 2501 cell->tile [z] = t;
2230 } 2502 }
2232 } 2504 }
2233 } 2505 }
2234 } 2506 }
2235} 2507}
2236 2508
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2509MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2510
2239PROTOTYPES: DISABLE 2511DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2512new (SV *class, SV *data_sv)
2243 CODE: 2513 CODE:
2244{ 2514{
2245 STRLEN datalen; 2515 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2516 char *data = SvPVbyte (data_sv, datalen);
2247 2517
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2518 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2519}
2250 OUTPUT: 2520 OUTPUT:
2251 RETVAL 2521 RETVAL
2252 2522
2253CFPlus::MixChunk 2523DC::RW
2254new_from_file (SV *class, char *path) 2524new_from_file (SV *class, const char *path, const char *mode = "rb")
2255 CODE: 2525 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2526 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2527 OUTPUT:
2258 RETVAL 2528 RETVAL
2259 2529
2530# fails on win32:
2531# dc.xs(2268) : error C2059: syntax error : '('
2260void 2532#void
2533#close (DC::RW self)
2534# CODE:
2535# (self->(close)) (self);
2536
2537MODULE = Deliantra::Client PACKAGE = DC::Channel
2538
2539PROTOTYPES: DISABLE
2540
2541DC::Channel
2542find ()
2543 CODE:
2544{
2545 RETVAL = Mix_GroupAvailable (-1);
2546
2547 if (RETVAL < 0)
2548 {
2549 RETVAL = Mix_GroupOldest (-1);
2550
2551 if (RETVAL < 0)
2552 XSRETURN_UNDEF;
2553
2554 Mix_HaltChannel (RETVAL);
2555 }
2556
2557 Mix_UnregisterAllEffects (RETVAL);
2558 Mix_Volume (RETVAL, 128);
2559}
2560 OUTPUT:
2561 RETVAL
2562
2563void
2564halt (DC::Channel self)
2565 CODE:
2566 Mix_HaltChannel (self);
2567
2568void
2569expire (DC::Channel self, int ticks = -1)
2570 CODE:
2571 Mix_ExpireChannel (self, ticks);
2572
2573void
2574fade_out (DC::Channel self, int ticks = -1)
2575 CODE:
2576 Mix_FadeOutChannel (self, ticks);
2577
2578int
2579volume (DC::Channel self, int volume)
2580 CODE:
2581 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2582 OUTPUT:
2583 RETVAL
2584
2585void
2586unregister_all_effects (DC::Channel self)
2587 CODE:
2588 Mix_UnregisterAllEffects (self);
2589
2590void
2591set_panning (DC::Channel self, int left, int right)
2592 CODE:
2593 left = CLAMP (left , 0, 255);
2594 right = CLAMP (right, 0, 255);
2595 Mix_SetPanning (self, left, right);
2596
2597void
2598set_distance (DC::Channel self, int distance)
2599 CODE:
2600 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2601
2602void
2603set_position (DC::Channel self, int angle, int distance)
2604 CODE:
2605
2606void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE:
2609{
2610 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613}
2614
2615void
2616set_reverse_stereo (DC::Channel self, int flip)
2617 CODE:
2618 Mix_SetReverseStereo (self, flip);
2619
2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2621
2622PROTOTYPES: DISABLE
2623
2624DC::MixChunk
2625new (SV *class, DC::RW rwops)
2626 CODE:
2627 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2628 OUTPUT:
2629 RETVAL
2630
2631void
2261DESTROY (CFPlus::MixChunk self) 2632DESTROY (DC::MixChunk self)
2262 CODE: 2633 CODE:
2263 Mix_FreeChunk (self); 2634 Mix_FreeChunk (self);
2264 2635
2265int 2636int
2266volume (CFPlus::MixChunk self, int volume = -1) 2637volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2638 CODE:
2639 if (items > 1)
2640 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2641 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2642 OUTPUT:
2270 RETVAL 2643 RETVAL
2271 2644
2272int 2645DC::Channel
2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2646play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2274 CODE: 2647 CODE:
2648{
2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2649 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2650
2651 if (RETVAL < 0)
2652 XSRETURN_UNDEF;
2653
2654 if (channel < 0)
2655 {
2656 Mix_UnregisterAllEffects (RETVAL);
2657 Mix_Volume (RETVAL, 128);
2658 }
2659}
2276 OUTPUT: 2660 OUTPUT:
2277 RETVAL 2661 RETVAL
2278 2662
2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2280 2664
2281int 2665int
2282volume (int volume = -1) 2666volume (int volume = -1)
2283 PROTOTYPE: ;$ 2667 PROTOTYPE: ;$
2284 CODE: 2668 CODE:
2669 if (items > 0)
2670 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 2671 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 2672 OUTPUT:
2287 RETVAL 2673 RETVAL
2288 2674
2675void
2676fade_out (int ms)
2677 CODE:
2678 Mix_FadeOutMusic (ms);
2679
2680void
2681halt ()
2682 CODE:
2683 Mix_HaltMusic ();
2684
2685DC::MixMusic
2686new (SV *class, DC::RW rwops)
2687 CODE:
2688 RETVAL = Mix_LoadMUS_RW (rwops);
2689 OUTPUT:
2690 RETVAL
2691
2692void
2693DESTROY (DC::MixMusic self)
2694 CODE:
2695 Mix_FreeMusic (self);
2696
2289int 2697int
2290fade_out (int ms)
2291 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms);
2293 OUTPUT:
2294 RETVAL
2295
2296CFPlus::MixMusic
2297new_from_file (SV *class, char *path)
2298 CODE:
2299 RETVAL = Mix_LoadMUS (path);
2300 OUTPUT:
2301 RETVAL
2302
2303void
2304DESTROY (CFPlus::MixMusic self)
2305 CODE:
2306 Mix_FreeMusic (self);
2307
2308int
2309play (CFPlus::MixMusic self, int loops = -1) 2698play (DC::MixMusic self, int loops = -1)
2310 CODE: 2699 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 2700 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 2701 OUTPUT:
2313 RETVAL 2702 RETVAL
2314 2703
2315int 2704void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2705fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 2706 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2707 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 2708
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2709MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 2710
2324PROTOTYPES: ENABLE 2711PROTOTYPES: ENABLE
2325 2712
2326BOOT: 2713BOOT:
2327{ 2714{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2715 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 2716 static const struct {
2330 const char *name; 2717 const char *name;
2331 IV iv; 2718 IV iv;
2332 } *civ, const_iv[] = { 2719 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 2720# define const_iv(name) { # name, (IV)name }
2368 const_iv (GL_INTENSITY), 2755 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 2756 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 2757 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 2758 const_iv (GL_FLOAT),
2372 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2760 const_iv (GL_COMPRESSED_ALPHA_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2762 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2763 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2764 const_iv (GL_COMPRESSED_RGB_ARB),
2765 const_iv (GL_COMPRESSED_RGBA_ARB),
2373 const_iv (GL_COMPILE), 2766 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 2767 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 2768 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 2769 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 2770 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2809 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 2810 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 2811 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 2812 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 2813 const_iv (GL_GENERATE_MIPMAP_HINT),
2814 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 2815 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 2816 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 2817 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 2818 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 2819 const_iv (GL_V3F),
2433 2827
2434 texture_av = newAV (); 2828 texture_av = newAV ();
2435 AvREAL_off (texture_av); 2829 AvREAL_off (texture_av);
2436} 2830}
2437 2831
2832void
2833disable_GL_EXT_blend_func_separate ()
2834 CODE:
2835 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0;
2837
2438char * 2838char *
2439gl_vendor () 2839gl_vendor ()
2440 CODE: 2840 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 2841 RETVAL = (char *)glGetString (GL_VENDOR);
2442 OUTPUT: 2842 OUTPUT:
2563 2963
2564void glRect (float x1, float y1, float x2, float y2) 2964void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 2965 CODE:
2566 glRectf (x1, y1, x2, y2); 2966 glRectf (x1, y1, x2, y2);
2567 2967
2968void glRect_lineloop (float x1, float y1, float x2, float y2)
2969 CODE:
2970 glBegin (GL_LINE_LOOP);
2971 glVertex2f (x1, y1);
2972 glVertex2f (x2, y1);
2973 glVertex2f (x2, y2);
2974 glVertex2f (x1, y2);
2975 glEnd ();
2976
2568PROTOTYPES: ENABLE 2977PROTOTYPES: ENABLE
2569 2978
2570void glBegin (int mode) 2979void glBegin (int mode)
2571 2980
2572void glEnd () 2981void glEnd ()
2604void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3013void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2605 CODE: 3014 CODE:
2606 if (gl.SeparableFilter2D) 3015 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3016 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 3017
2609void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3018void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2610 3019
2611void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3020void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2612 3021
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 3022void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 3023
2640 3049
2641void glEndList () 3050void glEndList ()
2642 3051
2643void glCallList (int list) 3052void glCallList (int list)
2644 3053
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2646 3055
2647PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2648 3057
2649void 3058void
2650find_widget (SV *self, NV x, NV y) 3059find_widget (SV *self, NV x, NV y)
2654 XPUSHs (self); 3063 XPUSHs (self);
2655} 3064}
2656 3065
2657BOOT: 3066BOOT:
2658{ 3067{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3068 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3069
2661 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3070 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2662 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3071 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2663 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3072 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2664 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3073 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2665} 3074}
2666 3075
2667void 3076void
2668draw (SV *self) 3077draw (SV *self)
2669 CODE: 3078 CODE:
2673 NV x, y, w, h; 3082 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3083 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3084 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3085 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3086 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3087 double draw_x, draw_y;
2680 3088
2681 if (!SvROK (self)) 3089 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3090 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3091
2684 hv = (HV *)SvRV (self); 3092 hv = (HV *)SvRV (self);
2685 3093
2686 if (SvTYPE (hv) != SVt_PVHV) 3094 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3095 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3096
2689 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3097 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2690 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3098 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2691 3099
2692 if (!h || !w) 3100 if (!h || !w)
2712 { 3120 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3121 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3122
2715 if (svp && SvTRUE (*svp)) 3123 if (svp && SvTRUE (*svp))
2716 { 3124 {
2717 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3125 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2718 glEnable (GL_BLEND); 3126 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3127 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3128 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3129 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3130 glVertex2f (w, 0);
2725 glEnd (); 3133 glEnd ();
2726 glDisable (GL_BLEND); 3134 glDisable (GL_BLEND);
2727 } 3135 }
2728 } 3136 }
2729#if 0 3137#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3138 // draw borders, for debugging
2731 glPushMatrix; 3139 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3140 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3141 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3142 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3143 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3144 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3145 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3146 glVertex2f (0 , h - 1);
2739 glEnd; 3147 glEnd ();
2740 glPopMatrix; 3148 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3149#endif
2744 PUSHMARK (SP); 3150 PUSHMARK (SP);
2745 XPUSHs (self); 3151 XPUSHs (self);
2746 PUTBACK; 3152 PUTBACK;
2747 call_method ("_draw", G_VOID | G_DISCARD); 3153 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines