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.234 by root, Mon Aug 27 02:52:54 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
120 137
121#include "pango-font.c" 138#include "pango-font.c"
122#include "pango-fontmap.c" 139#include "pango-fontmap.c"
123#include "pango-render.c" 140#include "pango-render.c"
124 141
125typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
129 146
130typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
131 148
132static int 149static int
133shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
134{ 151{
135 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
149 166
150typedef struct cf_layout { 167typedef struct cf_layout {
151 PangoLayout *pl; 168 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
153 int base_height; 170 int base_height;
154 CFPlus__Font font; 171 DC__Font font;
155 rc_t *rc; 172 rc_t *rc;
156} *CFPlus__Layout; 173} *DC__Layout;
157 174
158static CFPlus__Font default_font; 175static DC__Font default_font;
159static PangoContext *opengl_context; 176static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
161 178
162static void 179static void
163substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
168#endif 185#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 187}
171 188
172static void 189static void
173layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 199
183 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
184} 201}
185 202
186static void 203static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 205{
189 PangoRectangle rect; 206 PangoRectangle rect;
190 207
191 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
233 250
234 int32_t rows; 251 int32_t rows;
235 maprow *row; 252 maprow *row;
236} *CFPlus__Map; 253} *DC__Map;
237 254
238static char * 255static char *
239prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
240{ 257{
241 char *p; 258 char *p;
279 self->texs *= 2; 296 self->texs *= 2;
280 } 297 }
281} 298}
282 299
283static maprow * 300static maprow *
284map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
285{ 302{
286 if (0 > y) 303 if (0 > y)
287 { 304 {
288 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
327 344
328 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
329} 346}
330 347
331static mapcell * 348static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
333{ 350{
334 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
335} 352}
336 353
337static void 354static void
338map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
339{ 356{
340 int r; 357 int r;
341 358
342 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
355static void 372static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 374{
358 int x, y; 375 int x, y;
359 maprow *row; 376 maprow *row;
360 mapcell *cell; 377 mapcell *cell;
361 378
440 n |= n >> 16; 457 n |= n >> 16;
441 458
442 return n + 1; 459 return n + 1;
443} 460}
444 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
445/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
448 476
449/******************************************************************************/ 477/******************************************************************************/
487 return 0; 515 return 0;
488 516
489 return 1; 517 return 1;
490} 518}
491 519
492MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
493 521
494PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
495 523
496BOOT: 524BOOT:
497{ 525{
498 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 527 static const struct {
500 const char *name; 528 const char *name;
501 IV iv; 529 IV iv;
502 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
525 553
526 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
529 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
611# undef const_iv 652# undef const_iv
612 }; 653 };
613 654
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 674
634NV floor (NV x) 675NV floor (NV x)
635 676
636NV ceil (NV x) 677NV ceil (NV x)
637 678
679IV minpot (UV n)
680
681IV popcount (UV n)
682
638void 683void
639pango_init () 684pango_init ()
640 CODE: 685 CODE:
641{ 686{
642 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
694#endif
645} 695}
646 696
647char *
648SDL_GetError () 697char *SDL_GetError ()
649 698
650int 699int SDL_Init (U32 flags)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 700
653void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
654SDL_Quit () 705void SDL_Quit ()
655 706
656void 707void
657SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
658 PPCODE: 709 PPCODE:
659{ 710{
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 733
683 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
684 while (*m) 735 while (*m)
685 { 736 {
686 if ((*m)->w >= 640 && (*m)->h >= 480)
687 {
688 AV *av = newAV (); 737 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
692 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
693 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
694 }
695 743
696 ++m; 744 ++m;
697 } 745 }
698} 746}
699 747
715 763
716 if (RETVAL) 764 if (RETVAL)
717 { 765 {
718 av_clear (texture_av); 766 av_clear (texture_av);
719 767
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 770#include "glfunc.h"
723#undef GL_FUNC 771#undef GL_FUNC
724 } 772 }
725} 773}
732char * 780char *
733SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
734 782
735int 783int
736SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
737 788
738void 789void
739poll_events () 790poll_events ()
740 PPCODE: 791 PPCODE:
741{ 792{
751 { 802 {
752 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
753 case SDL_KEYUP: 804 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 810 break;
760 811
761 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 831 x = ev.motion.x;
781 y = ev.motion.y; 832 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 834 }
784 835
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 842 }
792 break; 843 break;
793 844
794 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 848
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 859 break;
809 } 860 }
810 861
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 863 }
813} 864}
814 865
815int 866int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 868 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 869 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 870 Mix_ChannelFinished (channel_finished);
871
872void
873Mix_QuerySpec ()
874 PPCODE:
875{
876 int freq, channels;
877 Uint16 format;
878
879 if (Mix_QuerySpec (&freq, &format, &channels))
880 {
881 EXTEND (SP, 3);
882 PUSHs (sv_2mortal (newSViv (freq)));
883 PUSHs (sv_2mortal (newSViv (format)));
884 PUSHs (sv_2mortal (newSViv (channels)));
885 }
886}
820 887
821void 888void
822Mix_CloseAudio () 889Mix_CloseAudio ()
823 890
824int 891int
859 } 926 }
860 } 927 }
861#endif 928#endif
862} 929}
863 930
864void 931int
865add_font (char *file) 932add_font (char *file)
866 CODE: 933 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
868 937
869void 938void
870load_image_inline (SV *image_) 939load_image_inline (SV *image_)
871 ALIAS: 940 ALIAS:
872 load_image_file = 1 941 load_image_file = 1
958void 1027void
959error (char *message) 1028error (char *message)
960 CODE: 1029 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1031#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1033#endif
965 1034
966void 1035void
967fatal (char *message) 1036fatal (char *message)
968 CODE: 1037 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1039#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1041#endif
973 _exit (1); 1042 _exit (1);
974 1043
975void 1044void
976_exit (int retval = 0) 1045_exit (int retval = 0)
988#if DEBUG 1057#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1058 VALGRIND_DO_LEAK_CHECK;
990#endif 1059#endif
991} 1060}
992 1061
993MODULE = CFPlus PACKAGE = CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
994 1063
995PROTOTYPES: DISABLE 1064PROTOTYPES: DISABLE
996 1065
997CFPlus::Font 1066DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1068 CODE:
1000{ 1069{
1001 int count; 1070 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1074}
1006 OUTPUT: 1075 OUTPUT:
1007 RETVAL 1076 RETVAL
1008 1077
1009void 1078void
1010DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
1011 CODE: 1080 CODE:
1012 pango_font_description_free (self); 1081 pango_font_description_free (self);
1013 1082
1014void 1083void
1015make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1016 PROTOTYPE: $ 1085 PROTOTYPE: $
1017 CODE: 1086 CODE:
1018 default_font = self; 1087 default_font = self;
1019 1088
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1090
1022PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1023 1092
1024void 1093void
1025reset_glyph_cache () 1094glyph_cache_backup ()
1026 PROTOTYPE: 1095 PROTOTYPE:
1027 CODE: 1096 CODE:
1097 tc_backup ();
1098
1099void
1100glyph_cache_restore ()
1101 PROTOTYPE:
1102 CODE:
1028 tc_clear (); 1103 tc_restore ();
1029 1104
1030CFPlus::Layout 1105DC::Layout
1031new (SV *class) 1106new (SV *class)
1032 CODE: 1107 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
1034 1109
1035 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
1046 OUTPUT: 1121 OUTPUT:
1047 RETVAL 1122 RETVAL
1048 1123
1049void 1124void
1050DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
1051 CODE: 1126 CODE:
1052 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1053 rc_free (self->rc); 1128 rc_free (self->rc);
1054 Safefree (self); 1129 Safefree (self);
1055 1130
1056void 1131void
1057set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
1058 CODE: 1133 CODE:
1059{ 1134{
1060 STRLEN textlen; 1135 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1062 1137
1063 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
1064} 1139}
1065 1140
1066void 1141void
1067set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
1068 CODE: 1143 CODE:
1069{ 1144{
1070 STRLEN textlen; 1145 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
1072 1147
1073 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
1074} 1149}
1075 1150
1076void 1151void
1077set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
1078 CODE: 1153 CODE:
1079{ 1154{
1080 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1157 const char *pos = text;
1117 if (attrs) 1192 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
1119} 1194}
1120 1195
1121void 1196void
1122get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
1123 PPCODE: 1198 PPCODE:
1124{ 1199{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1201
1127 do 1202 do
1128 { 1203 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1205
1131 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1132 { 1207 {
1133 PangoRectangle extents; 1208 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1217
1143 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
1144} 1219}
1145 1220
1146int 1221int
1147has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
1148 CODE: 1223 CODE:
1149{ 1224{
1150 int lines = 1; 1225 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
1152 1227
1157} 1232}
1158 OUTPUT: 1233 OUTPUT:
1159 RETVAL 1234 RETVAL
1160 1235
1161SV * 1236SV *
1162get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
1163 CODE: 1238 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1241 OUTPUT:
1167 RETVAL 1242 RETVAL
1168 1243
1169void 1244void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1245set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1246 CODE:
1172 self->r = r; 1247 self->r = r;
1173 self->g = g; 1248 self->g = g;
1174 self->b = b; 1249 self->b = b;
1175 self->a = a; 1250 self->a = a;
1176 1251
1177void 1252void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1254 CODE:
1180 if (self->font != font) 1255 if (self->font != font)
1181 { 1256 {
1182 self->font = font; 1257 self->font = font;
1183 layout_update_font (self); 1258 layout_update_font (self);
1184 } 1259 }
1185 1260
1186void 1261void
1187set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
1188 CODE: 1263 CODE:
1189 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
1190 { 1265 {
1191 self->base_height = base_height; 1266 self->base_height = base_height;
1192 layout_update_font (self); 1267 layout_update_font (self);
1193 } 1268 }
1194 1269
1195void 1270void
1196set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1272 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1273 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1274
1200void 1275void
1201set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1202 CODE: 1277 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1279
1205void 1280void
1206set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1207 CODE: 1282 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1284
1210void 1285void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1287 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1218 ); 1293 );
1219 1294
1220void 1295void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1297 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1299
1225void 1300void
1226size (CFPlus::Layout self) 1301size (DC::Layout self)
1227 PPCODE: 1302 PPCODE:
1228{ 1303{
1229 int w, h; 1304 int w, h;
1230 1305
1231 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1236} 1311}
1237 1312
1238int 1313int
1239descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1240 CODE: 1315 CODE:
1241{ 1316{
1242 PangoRectangle rect; 1317 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1246} 1321}
1247 OUTPUT: 1322 OUTPUT:
1248 RETVAL 1323 RETVAL
1249 1324
1250int 1325int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1327 CODE:
1253{ 1328{
1254 int index, trailing; 1329 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1330 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1257} 1332}
1258 OUTPUT: 1333 OUTPUT:
1259 RETVAL 1334 RETVAL
1260 1335
1261void 1336void
1262cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1338 PPCODE:
1264{ 1339{
1265 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1342
1268 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1347}
1273 1348
1274void 1349void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1351 PPCODE:
1277{ 1352{
1278 int line, x; 1353 int line, x;
1279 1354
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1358 --line;
1359#endif
1283 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1363}
1287 1364
1288void 1365void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1367 PPCODE:
1291{ 1368{
1292 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1293 int index, trailing; 1370 int index, trailing;
1294 1371
1295 if (line < 0) 1372 if (line < 0)
1296 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1297 1374
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1300 1377
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1379
1303 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1387 }
1311} 1388}
1312 1389
1313void 1390void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1392 CODE:
1316 rc_clear (self->rc); 1393 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1318 self->pl, 1395 self->pl,
1319 self->rc, 1396 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1401 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1402 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1403 pango_layout_context_changed (self->pl);
1327 1404
1328void 1405void
1329draw (CFPlus::Layout self) 1406draw (DC::Layout self)
1330 CODE: 1407 CODE:
1331{ 1408{
1332 glEnable (GL_TEXTURE_2D); 1409 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1410 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1411 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1419 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1420 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1421 glDisable (GL_TEXTURE_2D);
1345} 1422}
1346 1423
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1424MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1425
1349PROTOTYPES: ENABLE 1426PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1427
1353void 1428void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1429pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1430 CODE:
1356{ 1431{
1433 RETVAL = width > 0; 1508 RETVAL = width > 0;
1434} 1509}
1435 OUTPUT: 1510 OUTPUT:
1436 RETVAL 1511 RETVAL
1437 1512
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1514
1440PROTOTYPES: DISABLE 1515PROTOTYPES: DISABLE
1441 1516
1442CFPlus::Map 1517DC::Map
1443new (SV *class) 1518new (SV *class)
1444 CODE: 1519 CODE:
1445 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1521 RETVAL->x = 0;
1447 RETVAL->y = 0; 1522 RETVAL->y = 0;
1455 RETVAL->row = 0; 1530 RETVAL->row = 0;
1456 OUTPUT: 1531 OUTPUT:
1457 RETVAL 1532 RETVAL
1458 1533
1459void 1534void
1460DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1461 CODE: 1536 CODE:
1462{ 1537{
1463 map_clear (self); 1538 map_clear (self);
1464 Safefree (self->face2tile); 1539 Safefree (self->face2tile);
1465 Safefree (self->tex); 1540 Safefree (self->tex);
1466 Safefree (self); 1541 Safefree (self);
1467} 1542}
1468 1543
1469void 1544void
1470resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1546 CODE:
1472 self->w = map_width; 1547 self->w = map_width;
1473 self->h = map_height; 1548 self->h = map_height;
1474 1549
1475void 1550void
1476clear (CFPlus::Map self) 1551clear (DC::Map self)
1477 CODE: 1552 CODE:
1478 map_clear (self); 1553 map_clear (self);
1479 1554
1480void 1555void
1481set_tileid (CFPlus::Map self, int face, int tile) 1556set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1557 CODE:
1483{ 1558{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1559 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1560 need_texid (self, tile);
1486} 1561}
1487 1562
1488void 1563void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1564set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1565 CODE:
1491{ 1566{
1492 tileid texid; 1567 tileid texid;
1493 maptex *tex; 1568 maptex *tex;
1494 1569
1507 tex->smoothtile = self->face2tile [smooth]; 1582 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1583 tex->smoothlevel = level;
1509} 1584}
1510 1585
1511void 1586void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1587set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1588 CODE:
1514{ 1589{
1515 need_texid (self, texid); 1590 need_texid (self, texid);
1516 1591
1517 { 1592 {
1537 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1614}
1540 1615
1541int 1616int
1542ox (CFPlus::Map self) 1617ox (DC::Map self)
1543 ALIAS: 1618 ALIAS:
1544 oy = 1 1619 oy = 1
1545 x = 2 1620 x = 2
1546 y = 3 1621 y = 3
1547 w = 4 1622 w = 4
1558 } 1633 }
1559 OUTPUT: 1634 OUTPUT:
1560 RETVAL 1635 RETVAL
1561 1636
1562void 1637void
1563scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1564 CODE: 1639 CODE:
1565{ 1640{
1566 if (dx > 0) 1641 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1643 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1585 } 1660 }
1586} 1661}
1587 1662
1588SV * 1663SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1665 CODE:
1591{ 1666{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1669 mapcell *cell;
1622 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1623 1698
1624 do 1699 do
1625 { 1700 {
1626 ext = *data++; 1701 ext = *data++;
1627 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1628 1703
1629 if (cmd < 4) 1704 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1632 { 1707 {
1635 } 1710 }
1636 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1639 { 1714 {
1640 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1719
1643 data += *data + 1; 1720 data += *data + 1;
1644 } 1721 }
1645 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1723 cell->flags = *data++;
1683} 1760}
1684 OUTPUT: 1761 OUTPUT:
1685 RETVAL 1762 RETVAL
1686 1763
1687SV * 1764SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1766 CODE:
1690{ 1767{
1691 int x1, x; 1768 int x1, x;
1692 int y1, y; 1769 int y1, y;
1693 int z; 1770 int z;
1738} 1815}
1739 OUTPUT: 1816 OUTPUT:
1740 RETVAL 1817 RETVAL
1741 1818
1742void 1819void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1744 CODE: 1821 CODE:
1745{ 1822{
1746 int x, y, z; 1823 int x, y, z;
1747 1824
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1828 smooth_key skey;
1752 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1832 rc_key_t key;
1755 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1756 1836
1757 // thats current max. sorry. 1837 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1760 1840
1815 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1816 1896
1817 if (tile) 1897 if (tile)
1818 { 1898 {
1819 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1820 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1821 1902
1822 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1823 { 1904 {
1824 if (!tex.name) 1905 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1826 1907
1827 key.texname = tex.name; 1908 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1829 } 1910 }
1830 1911
1831 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1833 1919
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838 1924
1839 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 1926 {
1841 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 1928 if (cell->flags & 1)
1843 { 1929 {
1844 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1983 } 2069 }
1984 2070
1985 hv_clear (smooth); 2071 hv_clear (smooth);
1986 } 2072 }
1987 2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2089 }
2090
1988 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
1989 rc_free (rc); 2092 rc_free (rc);
1990 2093
1991 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
2019 } 2122 }
2020 } 2123 }
2021} 2124}
2022 2125
2023void 2126void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025 CODE: 2128 CODE:
2026{ 2129{
2027 static float color[16][3] = { 2130 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2081} 2184}
2082 2185
2083void 2186void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2188 PPCODE:
2086{ 2189{
2087 int x, y; 2190 int x, y;
2088 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2162} 2265}
2163 2266
2164SV * 2267SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2269 CODE:
2167{ 2270{
2168 int x, y, x1, y1; 2271 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2330 else
2228 *data++ = 0; 2331 *data++ = 0;
2229 } 2332 }
2230 } 2333 }
2231 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2232 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2234 RETVAL = data_sv; 2342 RETVAL = data_sv;
2235} 2343}
2236 OUTPUT: 2344 OUTPUT:
2237 RETVAL 2345 RETVAL
2238 2346
2239void 2347void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2349 PPCODE:
2242{ 2350{
2243 int x, y, z; 2351 int x, y, z;
2244 int w, h; 2352 int w, h;
2245 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2246 2364
2247 if (*data++ != 0) 2365 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2249 2367
2250 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2265 { 2383 {
2266 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2267 2385
2268 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2269 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2270 uint8_t flags = *data++; 2393 flags = *data++;
2271 2394
2272 if (flags) 2395 if (flags)
2273 { 2396 {
2274 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2403
2281 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2282 { 2405 {
2283 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2284 2408
2285 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2286 { 2410 {
2287 tileid t = tile [z]; 2411 tileid t = tile [z];
2288 2412
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2414 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2416 need_texid (self, t);
2293 } 2417 }
2294 2418
2295 cell->tile [z] = t; 2419 cell->tile [z] = t;
2296 } 2420 }
2298 } 2422 }
2299 } 2423 }
2300 } 2424 }
2301} 2425}
2302 2426
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2428
2305CFPlus::RW 2429DC::RW
2306new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2307 CODE: 2431 CODE:
2308{ 2432{
2309 STRLEN datalen; 2433 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2437}
2314 OUTPUT: 2438 OUTPUT:
2315 RETVAL 2439 RETVAL
2316 2440
2317CFPlus::RW 2441DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2443 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2445 OUTPUT:
2322 RETVAL 2446 RETVAL
2323 2447
2324# fails on win32: 2448# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2450#void
2327#close (CFPlus::RW self) 2451#close (DC::RW self)
2328# CODE: 2452# CODE:
2329# (self->(close)) (self); 2453# (self->(close)) (self);
2330 2454
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2456
2333PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2334 2458
2335CFPlus::Channel 2459DC::Channel
2336find () 2460find ()
2337 CODE: 2461 CODE:
2338{ 2462{
2339 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2340 2464
2353} 2477}
2354 OUTPUT: 2478 OUTPUT:
2355 RETVAL 2479 RETVAL
2356 2480
2357void 2481void
2358halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2359 CODE: 2483 CODE:
2360 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2361 2485
2362void 2486void
2363expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2364 CODE: 2488 CODE:
2365 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2366 2490
2367void 2491void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2493 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2371 2495
2372int 2496int
2373volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2374 CODE: 2498 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2500 OUTPUT:
2377 RETVAL 2501 RETVAL
2378 2502
2379void 2503void
2380unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2381 CODE: 2505 CODE:
2382 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2383 2507
2384void 2508void
2385set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2386 CODE: 2510 CODE:
2387 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2390 2514
2391void 2515void
2392set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2393 CODE: 2517 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2519
2396void 2520void
2397set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2522 CODE:
2399 2523
2400void 2524void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2526 CODE:
2403{ 2527{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2531}
2408 2532
2409void 2533void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2535 CODE:
2412 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2413 2537
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2539
2416PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2417 2541
2418CFPlus::MixChunk 2542DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2420 CODE: 2544 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2546 OUTPUT:
2423 RETVAL 2547 RETVAL
2424 2548
2425void 2549void
2426DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2427 CODE: 2551 CODE:
2428 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2429 2553
2430int 2554int
2431volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2556 CODE:
2433 if (items > 1) 2557 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2560 OUTPUT:
2437 RETVAL 2561 RETVAL
2438 2562
2439CFPlus::Channel 2563DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2565 CODE:
2442{ 2566{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2568
2445 if (RETVAL < 0) 2569 if (RETVAL < 0)
2452 } 2576 }
2453} 2577}
2454 OUTPUT: 2578 OUTPUT:
2455 RETVAL 2579 RETVAL
2456 2580
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2582
2459int 2583int
2460volume (int volume = -1) 2584volume (int volume = -1)
2461 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2462 CODE: 2586 CODE:
2474void 2598void
2475halt () 2599halt ()
2476 CODE: 2600 CODE:
2477 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2478 2602
2479CFPlus::MixMusic 2603DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2481 CODE: 2605 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2607 OUTPUT:
2484 RETVAL 2608 RETVAL
2485 2609
2486void 2610void
2487DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2488 CODE: 2612 CODE:
2489 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2490 2614
2491int 2615int
2492play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2493 CODE: 2617 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2619 OUTPUT:
2496 RETVAL 2620 RETVAL
2497 2621
2498void 2622void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2624 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2626
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2628
2505PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2506 2630
2507BOOT: 2631BOOT:
2508{ 2632{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2634 static const struct {
2511 const char *name; 2635 const char *name;
2512 IV iv; 2636 IV iv;
2513 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2807void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2808 CODE: 2932 CODE:
2809 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2810 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2811 2935
2812void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2813 2937
2814void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2815 2939
2816void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2817 2941
2843 2967
2844void glEndList () 2968void glEndList ()
2845 2969
2846void glCallList (int list) 2970void glCallList (int list)
2847 2971
2848MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2849 2973
2850PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2851 2975
2852void 2976void
2853find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2857 XPUSHs (self); 2981 XPUSHs (self);
2858} 2982}
2859 2983
2860BOOT: 2984BOOT:
2861{ 2985{
2862 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2863 2987
2864 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2988 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2865 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2989 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2866 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2990 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2867 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2868} 2992}
2869 2993
2870void 2994void
2871draw (SV *self) 2995draw (SV *self)
2872 CODE: 2996 CODE:
2879 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2880 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2881 double draw_x, draw_y; 3005 double draw_x, draw_y;
2882 3006
2883 if (!SvROK (self)) 3007 if (!SvROK (self))
2884 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2885 3009
2886 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2887 3011
2888 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2889 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2890 3014
2891 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3015 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2892 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2893 3017
2894 if (!h || !w) 3018 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines