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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 95
66# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
67#endif
68 97
69static AV *texture_av; 98static AV *texture_av;
70 99
71static struct 100static struct
72{ 101{
109 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
111} 140}
112 141
113#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
114 144
115#include "pango-font.c" 145#include "pango-font.c"
116#include "pango-fontmap.c" 146#include "pango-fontmap.c"
117#include "pango-render.c" 147#include "pango-render.c"
118 148
119typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
123 153
124typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
125 155
126static int 156static int
127shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
128{ 158{
129 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
143 173
144typedef struct cf_layout { 174typedef struct cf_layout {
145 PangoLayout *pl; 175 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
147 int base_height; 177 int base_height;
148 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
149} *CFPlus__Layout; 180} *DC__Layout;
150 181
151static CFPlus__Font default_font; 182static DC__Font default_font;
152static PangoContext *opengl_context; 183static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
154 185
155static void 186static void
156substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
161#endif 192#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 194}
164 195
165static void 196static void
166layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
167{ 198{
168 /* 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
169 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
170 */ 201 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
172 203
173 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 206
176 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
177} 208}
178 209
179static void 210static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 212{
182 PangoRectangle rect; 213 PangoRectangle rect;
183 214
184 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
196 227
197typedef uint16_t tileid; 228typedef uint16_t tileid;
198typedef uint16_t faceid; 229typedef uint16_t faceid;
199 230
200typedef struct { 231typedef struct {
201 int name; 232 GLuint name;
202 int w, h; 233 int w, h;
203 float s, t; 234 float s, t;
204 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
205 tileid smoothtile; 236 tileid smoothtile;
206 uint8_t smoothlevel; 237 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
226 257
227 int32_t rows; 258 int32_t rows;
228 maprow *row; 259 maprow *row;
229} *CFPlus__Map; 260} *DC__Map;
230 261
231static char * 262static char *
232prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
233{ 264{
234 char *p; 265 char *p;
272 self->texs *= 2; 303 self->texs *= 2;
273 } 304 }
274} 305}
275 306
276static maprow * 307static maprow *
277map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
278{ 309{
279 if (0 > y) 310 if (0 > y)
280 { 311 {
281 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
320 351
321 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
322} 353}
323 354
324static mapcell * 355static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
326{ 357{
327 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
328} 359}
329 360
330static void 361static void
331map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
332{ 363{
333 int r; 364 int r;
334 365
335 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
343 self->oy = 0; 374 self->oy = 0;
344 self->row = 0; 375 self->row = 0;
345 self->rows = 0; 376 self->rows = 0;
346} 377}
347 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
348static void 389static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 391{
351 int x, y; 392 int x, y;
352 maprow *row; 393 maprow *row;
353 mapcell *cell; 394 mapcell *cell;
354 395
366 if (x >= row->c1) 407 if (x >= row->c1)
367 break; 408 break;
368 409
369 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
370 411
371 cell->darkness = 0; 412 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 413 }
376 } 414 }
377} 415}
378 416
379typedef struct { 417typedef struct {
433 n |= n >> 16; 471 n |= n >> 16;
434 472
435 return n + 1; 473 return n + 1;
436} 474}
437 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
438/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
441 490
442/******************************************************************************/ 491/******************************************************************************/
480 return 0; 529 return 0;
481 530
482 return 1; 531 return 1;
483} 532}
484 533
485MODULE = CFPlus PACKAGE = CFPlus 534/* process keyboard modifiers */
535static int
536mod_munge (int mod)
537{
538 mod &= MOD_MASK;
539
540 if (mod & (KMOD_META | KMOD_ALT))
541 mod |= KMOD_LRAM;
542
543 return mod;
544}
545
546static void
547deliantra_main ()
548{
549 char *argv[] = { 0 };
550 call_argv ("::main", G_DISCARD | G_VOID, argv);
551}
552
553#ifdef __MACOSX__
554 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back.
559 */
560 extern C_LINKAGE int
561 main (int argc, char *argv[])
562 {
563 deliantra_main ();
564 }
565
566 #undef main
567
568 extern C_LINKAGE int main (int argc, char *argv[]);
569
570 static void
571 SDL_braino (void)
572 {
573 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv);
575 }
576#else
577 static void
578 SDL_braino (void)
579 {
580 deliantra_main ();
581 }
582#endif
583
584MODULE = Deliantra::Client PACKAGE = DC
486 585
487PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
488 587
489BOOT: 588BOOT:
490{ 589{
491 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 591 static const struct {
493 const char *name; 592 const char *name;
494 IV iv; 593 IV iv;
495 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
518 617
519 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
522 621
622
623 const_iv (SDLK_UNKNOWN),
624 const_iv (SDLK_FIRST),
625 const_iv (SDLK_BACKSPACE),
626 const_iv (SDLK_TAB),
627 const_iv (SDLK_CLEAR),
628 const_iv (SDLK_RETURN),
629 const_iv (SDLK_PAUSE),
630 const_iv (SDLK_ESCAPE),
631 const_iv (SDLK_SPACE),
632 const_iv (SDLK_EXCLAIM),
633 const_iv (SDLK_QUOTEDBL),
634 const_iv (SDLK_HASH),
635 const_iv (SDLK_DOLLAR),
636 const_iv (SDLK_AMPERSAND),
637 const_iv (SDLK_QUOTE),
638 const_iv (SDLK_LEFTPAREN),
639 const_iv (SDLK_RIGHTPAREN),
640 const_iv (SDLK_ASTERISK),
641 const_iv (SDLK_PLUS),
642 const_iv (SDLK_COMMA),
643 const_iv (SDLK_MINUS),
644 const_iv (SDLK_PERIOD),
645 const_iv (SDLK_SLASH),
646 const_iv (SDLK_0),
647 const_iv (SDLK_1),
648 const_iv (SDLK_2),
649 const_iv (SDLK_3),
650 const_iv (SDLK_4),
651 const_iv (SDLK_5),
652 const_iv (SDLK_6),
653 const_iv (SDLK_7),
654 const_iv (SDLK_8),
655 const_iv (SDLK_9),
656 const_iv (SDLK_COLON),
657 const_iv (SDLK_SEMICOLON),
658 const_iv (SDLK_LESS),
659 const_iv (SDLK_EQUALS),
660 const_iv (SDLK_GREATER),
661 const_iv (SDLK_QUESTION),
662 const_iv (SDLK_AT),
663
664 const_iv (SDLK_LEFTBRACKET),
665 const_iv (SDLK_BACKSLASH),
666 const_iv (SDLK_RIGHTBRACKET),
667 const_iv (SDLK_CARET),
668 const_iv (SDLK_UNDERSCORE),
669 const_iv (SDLK_BACKQUOTE),
670 const_iv (SDLK_DELETE),
671
672 const_iv (SDLK_FIRST),
673 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
755
756 const_iv (KMOD_LRAM),
757
758 const_iv (MIX_DEFAULT_FORMAT),
759
760 const_iv (SDL_INIT_TIMER),
761 const_iv (SDL_INIT_AUDIO),
762 const_iv (SDL_INIT_VIDEO),
763 const_iv (SDL_INIT_CDROM),
764 const_iv (SDL_INIT_JOYSTICK),
765 const_iv (SDL_INIT_EVERYTHING),
766 const_iv (SDL_INIT_NOPARACHUTE),
767 const_iv (SDL_INIT_EVENTTHREAD),
768
769 const_iv (SDL_GL_RED_SIZE),
770 const_iv (SDL_GL_GREEN_SIZE),
771 const_iv (SDL_GL_BLUE_SIZE),
772 const_iv (SDL_GL_ALPHA_SIZE),
773 const_iv (SDL_GL_DOUBLEBUFFER),
774 const_iv (SDL_GL_BUFFER_SIZE),
775 const_iv (SDL_GL_DEPTH_SIZE),
776 const_iv (SDL_GL_STENCIL_SIZE),
777 const_iv (SDL_GL_ACCUM_RED_SIZE),
778 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
779 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
780 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
781 const_iv (SDL_GL_STEREO),
782 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
783 const_iv (SDL_GL_MULTISAMPLESAMPLES),
784 const_iv (SDL_GL_ACCELERATED_VISUAL),
785 const_iv (SDL_GL_SWAP_CONTROL),
786
787 const_iv (FOW_DARKNESS)
604# undef const_iv 788# undef const_iv
605 }; 789 };
606 790
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 810
627NV floor (NV x) 811NV floor (NV x)
628 812
629NV ceil (NV x) 813NV ceil (NV x)
630 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
631void 819void
632pango_init () 820pango_init ()
633 CODE: 821 CODE:
634{ 822{
635 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 824 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 825 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
826 /*pango_context_set_font_description (opengl_context, default_font);*/
827#if PANGO_VERSION_CHECK (1, 15, 2)
828 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
829 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
830#endif
638} 831}
639 832
640char *
641SDL_GetError () 833char *SDL_GetError ()
642 834
643int 835void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 836
646void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
647SDL_Quit () 843void SDL_Quit ()
844
845int SDL_GL_SetAttribute (int attr, int value)
846
847int SDL_GL_GetAttribute (int attr)
848 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL))
850 XSRETURN_UNDEF;
851 OUTPUT:
852 RETVAL
648 853
649void 854void
650SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
651 PPCODE: 856 PPCODE:
652{ 857{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 872
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 875
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 877
676 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
677 while (*m) 879 while (*m)
678 { 880 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 882 {
681 AV *av = newAV (); 883 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
708 910
709 if (RETVAL) 911 if (RETVAL)
710 { 912 {
711 av_clear (texture_av); 913 av_clear (texture_av);
712 914
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 917#include "glfunc.h"
716#undef GL_FUNC 918#undef GL_FUNC
717 } 919 }
718} 920}
725char * 927char *
726SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
727 929
728int 930int
729SDL_GetAppState () 931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
730 935
731void 936void
732poll_events () 937poll_events ()
733 PPCODE: 938 PPCODE:
734{ 939{
744 { 949 {
745 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
746 case SDL_KEYUP: 951 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 954 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 955 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 957 break;
753 958
754 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 978 x = ev.motion.x;
774 y = ev.motion.y; 979 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 981 }
777 982
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 989 }
785 break; 990 break;
786 991
787 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 995
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1006 break;
802 } 1007 }
803 1008
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1010 }
806} 1011}
807 1012
808int 1013int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1015 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
813 1018
814void 1019void
1020Mix_QuerySpec ()
1021 PPCODE:
1022{
1023 int freq, channels;
1024 Uint16 format;
1025
1026 if (Mix_QuerySpec (&freq, &format, &channels))
1027 {
1028 EXTEND (SP, 3);
1029 PUSHs (sv_2mortal (newSViv (freq)));
1030 PUSHs (sv_2mortal (newSViv (format)));
1031 PUSHs (sv_2mortal (newSViv (channels)));
1032 }
1033}
1034
1035void
815Mix_CloseAudio () 1036Mix_CloseAudio ()
816 1037
817int 1038int
818Mix_AllocateChannels (int numchans = -1) 1039Mix_AllocateChannels (int numchans = -1)
1040
1041const char *
1042Mix_GetError ()
819 1043
820void 1044void
821lowdelay (int fd, int val = 1) 1045lowdelay (int fd, int val = 1)
822 CODE: 1046 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1047 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1073 }
850 } 1074 }
851#endif 1075#endif
852} 1076}
853 1077
854void 1078int
855add_font (char *file) 1079add_font (char *file)
856 CODE: 1080 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
858 1084
859void 1085void
860load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
861 ALIAS: 1087 ALIAS:
862 load_image_file = 1 1088 load_image_file = 1
948void 1174void
949error (char *message) 1175error (char *message)
950 CODE: 1176 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1178#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1180#endif
955 1181
956void 1182void
957fatal (char *message) 1183fatal (char *message)
958 CODE: 1184 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1186#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1188#endif
963 _exit (1); 1189 _exit (1);
964 1190
965void 1191void
966_exit (int retval = 0) 1192_exit (int retval = 0)
978#if DEBUG 1204#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1205 VALGRIND_DO_LEAK_CHECK;
980#endif 1206#endif
981} 1207}
982 1208
983MODULE = CFPlus PACKAGE = CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
984 1210
985PROTOTYPES: DISABLE 1211PROTOTYPES: DISABLE
986 1212
987CFPlus::Font 1213DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1215 CODE:
990{ 1216{
991 int count; 1217 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1221}
996 OUTPUT: 1222 OUTPUT:
997 RETVAL 1223 RETVAL
998 1224
999void 1225void
1000DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
1001 CODE: 1227 CODE:
1002 pango_font_description_free (self); 1228 pango_font_description_free (self);
1003 1229
1004void 1230void
1005make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1006 PROTOTYPE: $ 1232 PROTOTYPE: $
1007 CODE: 1233 CODE:
1008 default_font = self; 1234 default_font = self;
1009 1235
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1237
1012PROTOTYPES: DISABLE 1238PROTOTYPES: DISABLE
1013 1239
1014void 1240void
1015reset_glyph_cache () 1241glyph_cache_backup ()
1016 PROTOTYPE: 1242 PROTOTYPE:
1017 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
1018 tc_clear (); 1250 tc_restore ();
1019 1251
1020CFPlus::Layout 1252DC::Layout
1021new (SV *class) 1253new (SV *class)
1022 CODE: 1254 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1024 1256
1025 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1032 1265
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1035 OUTPUT: 1268 OUTPUT:
1036 RETVAL 1269 RETVAL
1037 1270
1038void 1271void
1039DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1040 CODE: 1273 CODE:
1041 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
1042 Safefree (self); 1276 Safefree (self);
1043 1277
1044void 1278void
1045set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1046 CODE: 1280 CODE:
1047{ 1281{
1048 STRLEN textlen; 1282 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1050 1284
1051 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1052} 1286}
1053 1287
1054void 1288void
1055set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1056 CODE: 1290 CODE:
1057{ 1291{
1058 STRLEN textlen; 1292 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1060 1294
1061 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1062} 1296}
1063 1297
1064void 1298void
1065set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1066 CODE: 1300 CODE:
1067{ 1301{
1068 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1304 const char *pos = text;
1105 if (attrs) 1339 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1107} 1341}
1108 1342
1109void 1343void
1110get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1111 PPCODE: 1345 PPCODE:
1112{ 1346{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1348
1115 do 1349 do
1116 { 1350 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1352
1119 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1120 { 1354 {
1121 PangoRectangle extents; 1355 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1364
1131 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1132} 1366}
1133 1367
1134int 1368int
1135has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1136 CODE: 1370 CODE:
1137{ 1371{
1138 int lines = 1; 1372 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1140 1374
1145} 1379}
1146 OUTPUT: 1380 OUTPUT:
1147 RETVAL 1381 RETVAL
1148 1382
1149SV * 1383SV *
1150get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1151 CODE: 1385 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1388 OUTPUT:
1155 RETVAL 1389 RETVAL
1156 1390
1157void 1391void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1392set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1393 CODE:
1160 self->r = r; 1394 self->r = r;
1161 self->g = g; 1395 self->g = g;
1162 self->b = b; 1396 self->b = b;
1163 self->a = a; 1397 self->a = a;
1164 1398
1165void 1399void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1401 CODE:
1168 if (self->font != font) 1402 if (self->font != font)
1169 { 1403 {
1170 self->font = font; 1404 self->font = font;
1171 layout_update_font (self); 1405 layout_update_font (self);
1172 } 1406 }
1173 1407
1174void 1408void
1175set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1176 CODE: 1410 CODE:
1177 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1178 { 1412 {
1179 self->base_height = base_height; 1413 self->base_height = base_height;
1180 layout_update_font (self); 1414 layout_update_font (self);
1181 } 1415 }
1182 1416
1183void 1417void
1184set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1419 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1420 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1421
1188void 1422void
1189set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1190 CODE: 1424 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1426
1193void 1427void
1194set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1195 CODE: 1429 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1431
1198void 1432void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1434 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1206 ); 1440 );
1207 1441
1208void 1442void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1444 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1446
1213void 1447void
1214size (CFPlus::Layout self) 1448size (DC::Layout self)
1215 PPCODE: 1449 PPCODE:
1216{ 1450{
1217 int w, h; 1451 int w, h;
1218 1452
1219 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1224} 1458}
1225 1459
1226int 1460int
1227descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1228 CODE: 1462 CODE:
1229{ 1463{
1230 PangoRectangle rect; 1464 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1234} 1468}
1235 OUTPUT: 1469 OUTPUT:
1236 RETVAL 1470 RETVAL
1237 1471
1238int 1472int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1474 CODE:
1241{ 1475{
1242 int index, trailing; 1476 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1477 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1245} 1479}
1246 OUTPUT: 1480 OUTPUT:
1247 RETVAL 1481 RETVAL
1248 1482
1249void 1483void
1250cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1485 PPCODE:
1252{ 1486{
1253 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1489
1256 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1494}
1261 1495
1262void 1496void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1498 PPCODE:
1265{ 1499{
1266 int line, x; 1500 int line, x;
1267 1501
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1505 --line;
1506#endif
1271 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1510}
1275 1511
1276void 1512void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1514 PPCODE:
1279{ 1515{
1280 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1281 int index, trailing; 1517 int index, trailing;
1282 1518
1283 if (line < 0) 1519 if (line < 0)
1284 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1285 1521
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1288 1524
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1526
1291 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1534 }
1299} 1535}
1300 1536
1301void 1537void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1539 CODE:
1540 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1305 self->pl, 1542 self->pl,
1543 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1308 flags 1546 flags
1309 ); 1547 );
1548 // we assume that context_change actually clears/frees stuff
1549 // and does not do any recomputation...
1550 pango_layout_context_changed (self->pl);
1310 1551
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1552void
1553draw (DC::Layout self)
1554 CODE:
1555{
1556 glEnable (GL_TEXTURE_2D);
1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1558 glEnable (GL_BLEND);
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563
1564 rc_draw (self->rc);
1565
1566 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D);
1569}
1570
1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1572
1313PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1574
1317void 1575void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1577 CODE:
1320{ 1578{
1347 HV *hv = (HV *)SvRV (self); 1605 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1606 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1607 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1608 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1609
1610 if (name <= 0)
1611 XSRETURN_EMPTY;
1612
1352 if (items < 5) 1613 if (items < 5)
1353 { 1614 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1615 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1616 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1617 }
1394 RETVAL = width > 0; 1655 RETVAL = width > 0;
1395} 1656}
1396 OUTPUT: 1657 OUTPUT:
1397 RETVAL 1658 RETVAL
1398 1659
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1661
1401PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1402 1663
1403CFPlus::Map 1664DC::Map
1404new (SV *class) 1665new (SV *class)
1405 CODE: 1666 CODE:
1406 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1668 RETVAL->x = 0;
1408 RETVAL->y = 0; 1669 RETVAL->y = 0;
1416 RETVAL->row = 0; 1677 RETVAL->row = 0;
1417 OUTPUT: 1678 OUTPUT:
1418 RETVAL 1679 RETVAL
1419 1680
1420void 1681void
1421DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1422 CODE: 1683 CODE:
1423{ 1684{
1424 map_clear (self); 1685 map_clear (self);
1425 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1426 Safefree (self->tex); 1687 Safefree (self->tex);
1427 Safefree (self); 1688 Safefree (self);
1428} 1689}
1429 1690
1430void 1691void
1431resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1693 CODE:
1433 self->w = map_width; 1694 self->w = map_width;
1434 self->h = map_height; 1695 self->h = map_height;
1435 1696
1436void 1697void
1437clear (CFPlus::Map self) 1698clear (DC::Map self)
1438 CODE: 1699 CODE:
1439 map_clear (self); 1700 map_clear (self);
1440 1701
1441void 1702void
1442set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1704 CODE:
1444{ 1705{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1707 need_texid (self, tile);
1447} 1708}
1448 1709
1449void 1710void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1712 CODE:
1452{ 1713{
1453 tileid texid; 1714 tileid texid;
1454 maptex *tex; 1715 maptex *tex;
1455 1716
1468 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1470} 1731}
1471 1732
1472void 1733void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1734set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1735 CODE:
1475{ 1736{
1476 need_texid (self, texid); 1737 need_texid (self, texid);
1477 1738
1478 { 1739 {
1498 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1761}
1501 1762
1502int 1763int
1503ox (CFPlus::Map self) 1764ox (DC::Map self)
1504 ALIAS: 1765 ALIAS:
1505 oy = 1 1766 oy = 1
1506 x = 2 1767 x = 2
1507 y = 3 1768 y = 3
1508 w = 4 1769 w = 4
1519 } 1780 }
1520 OUTPUT: 1781 OUTPUT:
1521 RETVAL 1782 RETVAL
1522 1783
1523void 1784void
1524scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1525 CODE: 1786 CODE:
1526{ 1787{
1527 if (dx > 0) 1788 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1790 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1805 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1546 } 1807 }
1547} 1808}
1548 1809
1549void 1810SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1812 CODE:
1552{ 1813{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1816 mapcell *cell;
1556 int x, y, flags; 1817 int x, y, z, flags;
1818 AV *missing = newAV ();
1819 RETVAL = newRV_noinc ((SV *)missing);
1557 1820
1558 while (data < data_end - 1) 1821 while (data < data_end - 1)
1559 { 1822 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1823 flags = (data [0] << 8) + data [1]; data += 2;
1561 1824
1581 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1582 1845
1583 do 1846 do
1584 { 1847 {
1585 ext = *data++; 1848 ext = *data++;
1586 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1587 1850
1588 if (cmd < 4) 1851 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1591 { 1854 {
1594 } 1857 }
1595 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1598 { 1861 {
1599 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1866
1602 data += *data + 1; 1867 data += *data + 1;
1603 } 1868 }
1604 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1870 cell->flags = *data++;
1612 } 1877 }
1613 else 1878 else
1614 cell->darkness = *data++ + 1; 1879 cell->darkness = *data++ + 1;
1615 } 1880 }
1616 1881
1882 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1883 if (flags & (4 >> z))
1618 { 1884 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1885 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1886 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1887 cell->tile [z] = self->face2tile [face];
1888
1889 if (cell->tile [z])
1890 {
1891 maptex *tex = self->tex + cell->tile [z];
1892 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z]));
1894
1895 if (tex->smoothtile)
1896 {
1897 maptex *smooth = self->tex + tex->smoothtile;
1898 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile));
1900 }
1901 }
1622 } 1902 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1903 }
1638 else 1904 else
1639 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1640 } 1906 }
1641} 1907}
1908 OUTPUT:
1909 RETVAL
1642 1910
1643SV * 1911SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1913 CODE:
1646{ 1914{
1647 int x1, x; 1915 int x1, x;
1648 int y1, y; 1916 int y1, y;
1649 int z; 1917 int z;
1694} 1962}
1695 OUTPUT: 1963 OUTPUT:
1696 RETVAL 1964 RETVAL
1697 1965
1698void 1966void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 1968 CODE:
1701{ 1969{
1970 int x, y, z;
1971
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1975 smooth_key skey;
1706 int x, y, z; 1976 int pl_x, pl_y;
1707 int last_name; 1977 maptex pl_tex;
1978 rc_t *rc = rc_alloc ();
1979 rc_key_t key;
1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1708 1983
1709 // thats current max. sorry. 1984 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1712 1987
1713 // clear key, in case of extra padding 1988 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1989 memset (&skey, 0, sizeof (skey));
1715 1990
1716 glColor4ub (255, 255, 255, 255); 1991 memset (&key, 0, sizeof (key));
1717 1992 key.r = 255;
1718 glEnable (GL_BLEND); 1993 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1994 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1995 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1996 key.mode = GL_QUADS;
1722 1997 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1998 key.texname = -1;
1724
1725 last_name = 0;
1726 1999
1727 mx += self->x; 2000 mx += self->x;
1728 my += self->y; 2001 my += self->y;
1729 2002
1730 // first pass: determine smooth_max 2003 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 2019 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2020 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2021 self->tex [cell->tile [2]].smoothlevel));
1749 } 2022 }
1750 } 2023 }
2024
2025 glEnable (GL_BLEND);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 2028
1752 for (z = 0; z <= 2; z++) 2029 for (z = 0; z <= 2; z++)
1753 { 2030 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2031 memset (smooth_level, 0, sizeof (smooth_level));
1755 2032
1768 { 2045 {
1769 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2047 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 2048 int py = (y + 1) * T - tex.h;
1772 2049
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2050 if (key.texname != tex.name)
1776 { 2051 {
1777 if (!tex.name) 2052 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1779 2054
1780 glEnd (); 2055 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2056 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2057 }
1784 2058
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
2066
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 2075 if (cell->flags & 1)
1793 { 2076 {
1794 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 2078 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 2079 int py = y * T - T * 6 / 32;
1797 2080
2081 if (tex.name)
1798 glEnd (); 2082 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 2093 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 2094 }
1807 } 2095 }
1808 2096
1809 // update smooth hash 2097 // update smooth hash
1810 if (tex.smoothtile) 2098 if (tex.smoothtile)
1846 } 2134 }
1847 } 2135 }
1848 } 2136 }
1849 } 2137 }
1850 2138
2139 rc_draw (rc);
2140 rc_clear (rc);
2141
1851 // go through all smoothlevels, lowest to highest, then draw. 2142 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2143 // this is basically counting sort
1853 { 2144 {
1854 int w, b; 2145 int w, b;
1855 2146
2147 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2149 for (w = 0; w < 256 / 32; ++w)
1857 { 2150 {
1858 uint32_t smask = smooth_level [w]; 2151 uint32_t smask = smooth_level [w];
1859 if (smask) 2152 if (smask)
1860 for (b = 0; b < 32; ++b) 2153 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2172 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2174 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2175 float dy = tex.t * .5f ; // 2 images/column
1883 2176
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2177 if (tex.name)
1887 { 2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
1888 if (!tex.name) 2181 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2182 {
1890
1891 glEnd (); 2183 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2185 glBegin (GL_QUADS);
1894 } 2186 }
1895 2187
1896 if (border) 2188 if (border)
1897 { 2189 {
1898 float ox = border * dx; 2190 float ox = border * dx;
1899 2191
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2196 }
1905 2197
1906 if (corner) 2198 if (corner)
1907 { 2199 {
1908 float ox = corner * dx; 2200 float ox = corner * dx;
1909 2201
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2206 }
1914 } 2207 }
1915 } 2208 }
1916 } 2209 }
1917 } 2210 }
1918 } 2211 }
2212
2213 glEnd ();
2214 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1;
1919 } 2216 }
1920 2217
1921 hv_clear (smooth); 2218 hv_clear (smooth);
1922 } 2219 }
1923 2220
1924 glEnd (); 2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
1925 2226
1926 glDisable (GL_TEXTURE_2D); 2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
2235 rc_draw (rc);
2236 }
2237
1927 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2239 rc_free (rc);
1928 2240
1929 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1932 { 2244 {
1957 } 2269 }
1958 } 2270 }
1959} 2271}
1960 2272
1961void 2273void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2275 CODE:
1964{ 2276{
1965 static float color[16][3] = { 2277 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2019} 2331}
2020 2332
2021void 2333void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2334fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2335 PPCODE:
2024{ 2336{
2025 int x, y; 2337 int x, y;
2026 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2348
2037 mx += self->x - 1; 2349 mx += self->x - 1;
2038 my += self->y - 1; 2350 my += self->y - 1;
2039 2351
2040 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2353
2042 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2044 { 2356 {
2045 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2100} 2412}
2101 2413
2102SV * 2414SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2415get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2416 CODE:
2105{ 2417{
2106 int x, y, x1, y1; 2418 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2477 else
2166 *data++ = 0; 2478 *data++ = 0;
2167 } 2479 }
2168 } 2480 }
2169 2481
2482 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 {
2170 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2172 RETVAL = data_sv; 2489 RETVAL = data_sv;
2173} 2490}
2174 OUTPUT: 2491 OUTPUT:
2175 RETVAL 2492 RETVAL
2176 2493
2177void 2494void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2496 PPCODE:
2180{ 2497{
2181 int x, y, z; 2498 int x, y, z;
2182 int w, h; 2499 int w, h;
2183 int x1, y1; 2500 int x1, y1;
2501 STRLEN len;
2502 uint8_t *data, *end;
2503
2504 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv);
2507 end = data + len + 8;
2508
2509 if (len < 5)
2510 XSRETURN_EMPTY;
2184 2511
2185 if (*data++ != 0) 2512 if (*data++ != 0)
2186 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2187 2514
2188 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
2190 2517
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2518 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2530 {
2204 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2205 2532
2206 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2207 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2208 uint8_t flags = *data++; 2540 flags = *data++;
2209 2541
2210 if (flags) 2542 if (flags)
2211 { 2543 {
2212 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2550
2219 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2220 { 2552 {
2221 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2222 2555
2223 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2224 { 2557 {
2225 tileid t = tile [z]; 2558 tileid t = tile [z];
2226 2559
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2561 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2563 need_texid (self, t);
2231 } 2564 }
2232 2565
2233 cell->tile [z] = t; 2566 cell->tile [z] = t;
2234 } 2567 }
2236 } 2569 }
2237 } 2570 }
2238 } 2571 }
2239} 2572}
2240 2573
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2575
2243CFPlus::RW 2576DC::RW
2244new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2245 CODE: 2578 CODE:
2246{ 2579{
2247 STRLEN datalen; 2580 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2584}
2252 OUTPUT: 2585 OUTPUT:
2253 RETVAL 2586 RETVAL
2254 2587
2255CFPlus::RW 2588DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2590 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2591 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2592 OUTPUT:
2260 RETVAL 2593 RETVAL
2261 2594
2595# fails on win32:
2596# dc.xs(2268) : error C2059: syntax error : '('
2262void 2597#void
2263close (CFPlus::RW self) 2598#close (DC::RW self)
2264 CODE: 2599# CODE:
2265 SDL_RWclose (self); 2600# (self->(close)) (self);
2266 2601
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2603
2269PROTOTYPES: DISABLE 2604PROTOTYPES: DISABLE
2270 2605
2271void 2606DC::Channel
2272halt (CFPlus::Channel self) 2607find ()
2273 CODE: 2608 CODE:
2609{
2610 RETVAL = Mix_GroupAvailable (-1);
2611
2612 if (RETVAL < 0)
2613 {
2614 RETVAL = Mix_GroupOldest (-1);
2615
2616 if (RETVAL < 0)
2617 XSRETURN_UNDEF;
2618
2274 Mix_HaltChannel (self); 2619 Mix_HaltChannel (RETVAL);
2620 }
2275 2621
2276void 2622 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2623 Mix_Volume (RETVAL, 128);
2278 CODE: 2624}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2625 OUTPUT:
2291 RETVAL 2626 RETVAL
2292 2627
2293void 2628void
2629halt (DC::Channel self)
2630 CODE:
2631 Mix_HaltChannel (self);
2632
2633void
2634expire (DC::Channel self, int ticks = -1)
2635 CODE:
2636 Mix_ExpireChannel (self, ticks);
2637
2638void
2639fade_out (DC::Channel self, int ticks = -1)
2640 CODE:
2641 Mix_FadeOutChannel (self, ticks);
2642
2643int
2644volume (DC::Channel self, int volume)
2645 CODE:
2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2647 OUTPUT:
2648 RETVAL
2649
2650void
2294unregister_all_effects (CFPlus::Channel self) 2651unregister_all_effects (DC::Channel self)
2295 CODE: 2652 CODE:
2296 Mix_UnregisterAllEffects (self); 2653 Mix_UnregisterAllEffects (self);
2297 2654
2298void 2655void
2299set_panning (CFPlus::Channel self, int left, int right) 2656set_panning (DC::Channel self, int left, int right)
2300 CODE: 2657 CODE:
2658 left = CLAMP (left , 0, 255);
2659 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2660 Mix_SetPanning (self, left, right);
2302 2661
2303void 2662void
2304set_distance (CFPlus::Channel self, int distance) 2663set_distance (DC::Channel self, int distance)
2305 CODE: 2664 CODE:
2306 Mix_SetDistance (self, distance); 2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2666
2308void 2667void
2309set_position (CFPlus::Channel self, int angle, int distance) 2668set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2669 CODE:
2670
2671void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE:
2674{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678}
2312 2679
2313void 2680void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2681set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2682 CODE:
2316 Mix_SetReverseStereo (self, flip); 2683 Mix_SetReverseStereo (self, flip);
2317 2684
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2686
2320PROTOTYPES: DISABLE 2687PROTOTYPES: DISABLE
2321 2688
2322CFPlus::MixChunk 2689DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2690new (SV *class, DC::RW rwops)
2324 CODE: 2691 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2693 OUTPUT:
2327 RETVAL 2694 RETVAL
2328 2695
2329void 2696void
2330DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2331 CODE: 2698 CODE:
2332 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2333 2700
2334int 2701int
2335volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2703 CODE:
2704 if (items > 1)
2705 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2707 OUTPUT:
2339 RETVAL 2708 RETVAL
2340 2709
2341CFPlus::Channel 2710DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2711play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2712 CODE:
2713{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2715
2716 if (RETVAL < 0)
2717 XSRETURN_UNDEF;
2718
2719 if (channel < 0)
2720 {
2345 Mix_UnregisterAllEffects (RETVAL); 2721 Mix_UnregisterAllEffects (RETVAL);
2722 Mix_Volume (RETVAL, 128);
2723 }
2724}
2346 OUTPUT: 2725 OUTPUT:
2347 RETVAL 2726 RETVAL
2348 2727
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2729
2351int 2730int
2352volume (int volume = -1) 2731volume (int volume = -1)
2353 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2354 CODE: 2733 CODE:
2734 if (items > 0)
2735 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2736 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2737 OUTPUT:
2357 RETVAL 2738 RETVAL
2358 2739
2359void 2740void
2364void 2745void
2365halt () 2746halt ()
2366 CODE: 2747 CODE:
2367 Mix_HaltMusic (); 2748 Mix_HaltMusic ();
2368 2749
2369CFPlus::MixMusic 2750DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2751new (SV *class, DC::RW rwops)
2371 CODE: 2752 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2754 OUTPUT:
2374 RETVAL 2755 RETVAL
2375 2756
2376void 2757void
2377DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2378 CODE: 2759 CODE:
2379 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2380 2761
2381int 2762int
2382play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2383 CODE: 2764 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2766 OUTPUT:
2386 RETVAL 2767 RETVAL
2387 2768
2388void 2769void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2771 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2773
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2775
2395PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2396 2777
2397BOOT: 2778BOOT:
2398{ 2779{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2781 static const struct {
2401 const char *name; 2782 const char *name;
2402 IV iv; 2783 IV iv;
2403 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2824 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2825 const_iv (GL_COMPRESSED_ALPHA_ARB),
2826 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2827 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2829 const_iv (GL_COMPRESSED_RGB_ARB),
2830 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2832 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2833 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2875 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2876 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2881 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2882 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
2504 2892
2505 texture_av = newAV (); 2893 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2894 AvREAL_off (texture_av);
2507} 2895}
2508 2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
2902
2509char * 2903char *
2510gl_vendor () 2904gl_vendor ()
2511 CODE: 2905 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2907 OUTPUT:
2634 3028
2635void glRect (float x1, float y1, float x2, float y2) 3029void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3030 CODE:
2637 glRectf (x1, y1, x2, y2); 3031 glRectf (x1, y1, x2, y2);
2638 3032
3033void glRect_lineloop (float x1, float y1, float x2, float y2)
3034 CODE:
3035 glBegin (GL_LINE_LOOP);
3036 glVertex2f (x1, y1);
3037 glVertex2f (x2, y1);
3038 glVertex2f (x2, y2);
3039 glVertex2f (x1, y2);
3040 glEnd ();
3041
2639PROTOTYPES: ENABLE 3042PROTOTYPES: ENABLE
2640 3043
2641void glBegin (int mode) 3044void glBegin (int mode)
2642 3045
2643void glEnd () 3046void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3079 CODE:
2677 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3082
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3083void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3084
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3085void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3086
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3088
2711 3114
2712void glEndList () 3115void glEndList ()
2713 3116
2714void glCallList (int list) 3117void glCallList (int list)
2715 3118
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3120
2718PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2719 3122
2720void 3123void
2721find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3128 XPUSHs (self);
2726} 3129}
2727 3130
2728BOOT: 3131BOOT:
2729{ 3132{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3134
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3135 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3136 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3137 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3138 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3139}
2737 3140
2738void 3141void
2739draw (SV *self) 3142draw (SV *self)
2740 CODE: 3143 CODE:
2744 NV x, y, w, h; 3147 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3148 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3149 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3152 double draw_x, draw_y;
2751 3153
2752 if (!SvROK (self)) 3154 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3156
2755 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2756 3158
2757 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3161
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3162 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3163 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3164
2763 if (!h || !w) 3165 if (!h || !w)
2783 { 3185 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3187
2786 if (svp && SvTRUE (*svp)) 3188 if (svp && SvTRUE (*svp))
2787 { 3189 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3190 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3191 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3193 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3194 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3195 glVertex2f (w, 0);
2796 glEnd (); 3198 glEnd ();
2797 glDisable (GL_BLEND); 3199 glDisable (GL_BLEND);
2798 } 3200 }
2799 } 3201 }
2800#if 0 3202#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3203 // draw borders, for debugging
2802 glPushMatrix; 3204 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3205 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3206 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3207 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3208 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3209 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3210 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3211 glVertex2f (0 , h - 1);
2810 glEnd; 3212 glEnd ();
2811 glPopMatrix; 3213 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3214#endif
2815 PUSHMARK (SP); 3215 PUSHMARK (SP);
2816 XPUSHs (self); 3216 XPUSHs (self);
2817 PUTBACK; 3217 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3218 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines