ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.284 by elmex, Thu Dec 11 00:17:47 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines