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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines