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.235 by root, Tue Aug 28 01:23:47 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
498 return 0; 515 return 0;
499 516
500 return 1; 517 return 1;
501} 518}
502 519
503MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
504 521
505PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
506 523
507BOOT: 524BOOT:
508{ 525{
509 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 527 static const struct {
511 const char *name; 528 const char *name;
512 IV iv; 529 IV iv;
513 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
623 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),
624# undef const_iv 652# undef const_iv
625 }; 653 };
626 654
627 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; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 685 CODE:
658{ 686{
659 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
660 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);
661 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
662} 695}
663 696
664char *
665SDL_GetError () 697char *SDL_GetError ()
666 698
667int 699int SDL_Init (U32 flags)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 700
670void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
671SDL_Quit () 705void SDL_Quit ()
672 706
673void 707void
674SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
675 PPCODE: 709 PPCODE:
676{ 710{
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 733
700 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
701 while (*m) 735 while (*m)
702 { 736 {
703 if ((*m)->w >= 640 && (*m)->h >= 480)
704 {
705 AV *av = newAV (); 737 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
709 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
710 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 }
712 743
713 ++m; 744 ++m;
714 } 745 }
715} 746}
716 747
732 763
733 if (RETVAL) 764 if (RETVAL)
734 { 765 {
735 av_clear (texture_av); 766 av_clear (texture_av);
736 767
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#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);
739#include "glfunc.h" 770#include "glfunc.h"
740#undef GL_FUNC 771#undef GL_FUNC
741 } 772 }
742} 773}
749char * 780char *
750SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
751 782
752int 783int
753SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
754 788
755void 789void
756poll_events () 790poll_events ()
757 PPCODE: 791 PPCODE:
758{ 792{
768 { 802 {
769 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
770 case SDL_KEYUP: 804 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 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);
774 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 */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 810 break;
777 811
778 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 831 x = ev.motion.x;
798 y = ev.motion.y; 832 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 834 }
801 835
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 842 }
809 break; 843 break;
810 844
811 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 848
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 859 break;
826 } 860 }
827 861
828 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))));
829 } 863 }
830} 864}
831 865
832int 866int
833Mix_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)
834 POSTCALL: 868 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 869 Mix_HookMusicFinished (music_finished);
836 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}
837 887
838void 888void
839Mix_CloseAudio () 889Mix_CloseAudio ()
840 890
841int 891int
876 } 926 }
877 } 927 }
878#endif 928#endif
879} 929}
880 930
881void 931int
882add_font (char *file) 932add_font (char *file)
883 CODE: 933 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
885 937
886void 938void
887load_image_inline (SV *image_) 939load_image_inline (SV *image_)
888 ALIAS: 940 ALIAS:
889 load_image_file = 1 941 load_image_file = 1
975void 1027void
976error (char *message) 1028error (char *message)
977 CODE: 1029 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1031#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1033#endif
982 1034
983void 1035void
984fatal (char *message) 1036fatal (char *message)
985 CODE: 1037 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1039#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1041#endif
990 _exit (1); 1042 _exit (1);
991 1043
992void 1044void
993_exit (int retval = 0) 1045_exit (int retval = 0)
1005#if DEBUG 1057#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1058 VALGRIND_DO_LEAK_CHECK;
1007#endif 1059#endif
1008} 1060}
1009 1061
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1063
1012PROTOTYPES: DISABLE 1064PROTOTYPES: DISABLE
1013 1065
1014CFPlus::Font 1066DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1068 CODE:
1017{ 1069{
1018 int count; 1070 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1074}
1023 OUTPUT: 1075 OUTPUT:
1024 RETVAL 1076 RETVAL
1025 1077
1026void 1078void
1027DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
1028 CODE: 1080 CODE:
1029 pango_font_description_free (self); 1081 pango_font_description_free (self);
1030 1082
1031void 1083void
1032make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1033 PROTOTYPE: $ 1085 PROTOTYPE: $
1034 CODE: 1086 CODE:
1035 default_font = self; 1087 default_font = self;
1036 1088
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1090
1039PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1040 1092
1041void 1093void
1042reset_glyph_cache () 1094glyph_cache_backup ()
1043 PROTOTYPE: 1095 PROTOTYPE:
1044 CODE: 1096 CODE:
1097 tc_backup ();
1098
1099void
1100glyph_cache_restore ()
1101 PROTOTYPE:
1102 CODE:
1045 tc_clear (); 1103 tc_restore ();
1046 1104
1047CFPlus::Layout 1105DC::Layout
1048new (SV *class) 1106new (SV *class)
1049 CODE: 1107 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
1051 1109
1052 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
1063 OUTPUT: 1121 OUTPUT:
1064 RETVAL 1122 RETVAL
1065 1123
1066void 1124void
1067DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
1068 CODE: 1126 CODE:
1069 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1070 rc_free (self->rc); 1128 rc_free (self->rc);
1071 Safefree (self); 1129 Safefree (self);
1072 1130
1073void 1131void
1074set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
1075 CODE: 1133 CODE:
1076{ 1134{
1077 STRLEN textlen; 1135 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1079 1137
1080 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
1081} 1139}
1082 1140
1083void 1141void
1084set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
1085 CODE: 1143 CODE:
1086{ 1144{
1087 STRLEN textlen; 1145 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
1089 1147
1090 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
1091} 1149}
1092 1150
1093void 1151void
1094set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
1095 CODE: 1153 CODE:
1096{ 1154{
1097 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1157 const char *pos = text;
1134 if (attrs) 1192 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
1136} 1194}
1137 1195
1138void 1196void
1139get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
1140 PPCODE: 1198 PPCODE:
1141{ 1199{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1201
1144 do 1202 do
1145 { 1203 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1205
1148 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1149 { 1207 {
1150 PangoRectangle extents; 1208 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1217
1160 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
1161} 1219}
1162 1220
1163int 1221int
1164has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
1165 CODE: 1223 CODE:
1166{ 1224{
1167 int lines = 1; 1225 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
1169 1227
1174} 1232}
1175 OUTPUT: 1233 OUTPUT:
1176 RETVAL 1234 RETVAL
1177 1235
1178SV * 1236SV *
1179get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
1180 CODE: 1238 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1241 OUTPUT:
1184 RETVAL 1242 RETVAL
1185 1243
1186void 1244void
1187set_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.)
1188 CODE: 1246 CODE:
1189 self->r = r; 1247 self->r = r;
1190 self->g = g; 1248 self->g = g;
1191 self->b = b; 1249 self->b = b;
1192 self->a = a; 1250 self->a = a;
1193 1251
1194void 1252void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1254 CODE:
1197 if (self->font != font) 1255 if (self->font != font)
1198 { 1256 {
1199 self->font = font; 1257 self->font = font;
1200 layout_update_font (self); 1258 layout_update_font (self);
1201 } 1259 }
1202 1260
1203void 1261void
1204set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
1205 CODE: 1263 CODE:
1206 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
1207 { 1265 {
1208 self->base_height = base_height; 1266 self->base_height = base_height;
1209 layout_update_font (self); 1267 layout_update_font (self);
1210 } 1268 }
1211 1269
1212void 1270void
1213set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1272 CODE:
1215 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);
1216 1274
1217void 1275void
1218set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1219 CODE: 1277 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1279
1222void 1280void
1223set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1224 CODE: 1282 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1284
1227void 1285void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1287 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1235 ); 1293 );
1236 1294
1237void 1295void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1297 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1299
1242void 1300void
1243size (CFPlus::Layout self) 1301size (DC::Layout self)
1244 PPCODE: 1302 PPCODE:
1245{ 1303{
1246 int w, h; 1304 int w, h;
1247 1305
1248 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1253} 1311}
1254 1312
1255int 1313int
1256descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1257 CODE: 1315 CODE:
1258{ 1316{
1259 PangoRectangle rect; 1317 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1263} 1321}
1264 OUTPUT: 1322 OUTPUT:
1265 RETVAL 1323 RETVAL
1266 1324
1267int 1325int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1327 CODE:
1270{ 1328{
1271 int index, trailing; 1329 int index, trailing;
1272 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);
1273 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1274} 1332}
1275 OUTPUT: 1333 OUTPUT:
1276 RETVAL 1334 RETVAL
1277 1335
1278void 1336void
1279cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1338 PPCODE:
1281{ 1339{
1282 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1342
1285 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1347}
1290 1348
1291void 1349void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1351 PPCODE:
1294{ 1352{
1295 int line, x; 1353 int line, x;
1296 1354
1297 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)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1358 --line;
1359#endif
1300 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1363}
1304 1364
1305void 1365void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1367 PPCODE:
1308{ 1368{
1309 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1310 int index, trailing; 1370 int index, trailing;
1311 1371
1312 if (line < 0) 1372 if (line < 0)
1313 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1314 1374
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1317 1377
1318 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);
1319 1379
1320 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1387 }
1328} 1388}
1329 1389
1330void 1390void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1392 CODE:
1333 rc_clear (self->rc); 1393 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1335 self->pl, 1395 self->pl,
1336 self->rc, 1396 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1401 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1402 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1403 pango_layout_context_changed (self->pl);
1344 1404
1345void 1405void
1346draw (CFPlus::Layout self) 1406draw (DC::Layout self)
1347 CODE: 1407 CODE:
1348{ 1408{
1349 glEnable (GL_TEXTURE_2D); 1409 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1410 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1411 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1419 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1420 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1421 glDisable (GL_TEXTURE_2D);
1362} 1422}
1363 1423
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1424MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1425
1366PROTOTYPES: ENABLE 1426PROTOTYPES: ENABLE
1367 1427
1368void 1428void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1429pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1508 RETVAL = width > 0;
1449} 1509}
1450 OUTPUT: 1510 OUTPUT:
1451 RETVAL 1511 RETVAL
1452 1512
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1514
1455PROTOTYPES: DISABLE 1515PROTOTYPES: DISABLE
1456 1516
1457CFPlus::Map 1517DC::Map
1458new (SV *class) 1518new (SV *class)
1459 CODE: 1519 CODE:
1460 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1521 RETVAL->x = 0;
1462 RETVAL->y = 0; 1522 RETVAL->y = 0;
1470 RETVAL->row = 0; 1530 RETVAL->row = 0;
1471 OUTPUT: 1531 OUTPUT:
1472 RETVAL 1532 RETVAL
1473 1533
1474void 1534void
1475DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1476 CODE: 1536 CODE:
1477{ 1537{
1478 map_clear (self); 1538 map_clear (self);
1479 Safefree (self->face2tile); 1539 Safefree (self->face2tile);
1480 Safefree (self->tex); 1540 Safefree (self->tex);
1481 Safefree (self); 1541 Safefree (self);
1482} 1542}
1483 1543
1484void 1544void
1485resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1546 CODE:
1487 self->w = map_width; 1547 self->w = map_width;
1488 self->h = map_height; 1548 self->h = map_height;
1489 1549
1490void 1550void
1491clear (CFPlus::Map self) 1551clear (DC::Map self)
1492 CODE: 1552 CODE:
1493 map_clear (self); 1553 map_clear (self);
1494 1554
1495void 1555void
1496set_tileid (CFPlus::Map self, int face, int tile) 1556set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1557 CODE:
1498{ 1558{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1559 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1560 need_texid (self, tile);
1501} 1561}
1502 1562
1503void 1563void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1564set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1565 CODE:
1506{ 1566{
1507 tileid texid; 1567 tileid texid;
1508 maptex *tex; 1568 maptex *tex;
1509 1569
1522 tex->smoothtile = self->face2tile [smooth]; 1582 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1583 tex->smoothlevel = level;
1524} 1584}
1525 1585
1526void 1586void
1527set_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)
1528 CODE: 1588 CODE:
1529{ 1589{
1530 need_texid (self, texid); 1590 need_texid (self, texid);
1531 1591
1532 { 1592 {
1552 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1614}
1555 1615
1556int 1616int
1557ox (CFPlus::Map self) 1617ox (DC::Map self)
1558 ALIAS: 1618 ALIAS:
1559 oy = 1 1619 oy = 1
1560 x = 2 1620 x = 2
1561 y = 3 1621 y = 3
1562 w = 4 1622 w = 4
1573 } 1633 }
1574 OUTPUT: 1634 OUTPUT:
1575 RETVAL 1635 RETVAL
1576 1636
1577void 1637void
1578scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1579 CODE: 1639 CODE:
1580{ 1640{
1581 if (dx > 0) 1641 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1643 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1600 } 1660 }
1601} 1661}
1602 1662
1603SV * 1663SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1665 CODE:
1606{ 1666{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1669 mapcell *cell;
1637 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1638 1698
1639 do 1699 do
1640 { 1700 {
1641 ext = *data++; 1701 ext = *data++;
1642 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1643 1703
1644 if (cmd < 4) 1704 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1647 { 1707 {
1650 } 1710 }
1651 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1654 { 1714 {
1655 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1656 ; // 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);
1657 1719
1658 data += *data + 1; 1720 data += *data + 1;
1659 } 1721 }
1660 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1723 cell->flags = *data++;
1698} 1760}
1699 OUTPUT: 1761 OUTPUT:
1700 RETVAL 1762 RETVAL
1701 1763
1702SV * 1764SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1766 CODE:
1705{ 1767{
1706 int x1, x; 1768 int x1, x;
1707 int y1, y; 1769 int y1, y;
1708 int z; 1770 int z;
1753} 1815}
1754 OUTPUT: 1816 OUTPUT:
1755 RETVAL 1817 RETVAL
1756 1818
1757void 1819void
1758draw (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)
1759 CODE: 1821 CODE:
1760{ 1822{
1761 int x, y, z; 1823 int x, y, z;
1762 1824
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 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
1765 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)
1766 smooth_key skey; 1828 smooth_key skey;
1767 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1832 rc_key_t key;
1770 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1771 1836
1772 // thats current max. sorry. 1837 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1775 1840
1830 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1831 1896
1832 if (tile) 1897 if (tile)
1833 { 1898 {
1834 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1835 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1836 1902
1837 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1838 { 1904 {
1839 if (!tex.name) 1905 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1841 1907
1842 key.texname = tex.name; 1908 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1844 } 1910 }
1845 1911
1846 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1848 1919
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 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);
1851 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);
1852 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);
1853 1924
1854 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 1926 {
1856 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 1928 if (cell->flags & 1)
1858 { 1929 {
1859 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1998 } 2069 }
1999 2070
2000 hv_clear (smooth); 2071 hv_clear (smooth);
2001 } 2072 }
2002 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
2003 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2004 rc_free (rc); 2092 rc_free (rc);
2005 2093
2006 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
2034 } 2122 }
2035 } 2123 }
2036} 2124}
2037 2125
2038void 2126void
2039draw_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)
2040 CODE: 2128 CODE:
2041{ 2129{
2042 static float color[16][3] = { 2130 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2096} 2184}
2097 2185
2098void 2186void
2099fow_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)
2100 PPCODE: 2188 PPCODE:
2101{ 2189{
2102 int x, y; 2190 int x, y;
2103 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2177} 2265}
2178 2266
2179SV * 2267SV *
2180get_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)
2181 CODE: 2269 CODE:
2182{ 2270{
2183 int x, y, x1, y1; 2271 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2330 else
2243 *data++ = 0; 2331 *data++ = 0;
2244 } 2332 }
2245 } 2333 }
2246 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 {
2247 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2249 RETVAL = data_sv; 2342 RETVAL = data_sv;
2250} 2343}
2251 OUTPUT: 2344 OUTPUT:
2252 RETVAL 2345 RETVAL
2253 2346
2254void 2347void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2349 PPCODE:
2257{ 2350{
2258 int x, y, z; 2351 int x, y, z;
2259 int w, h; 2352 int w, h;
2260 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;
2261 2364
2262 if (*data++ != 0) 2365 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2264 2367
2265 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2280 { 2383 {
2281 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2282 2385
2283 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2284 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2285 uint8_t flags = *data++; 2393 flags = *data++;
2286 2394
2287 if (flags) 2395 if (flags)
2288 { 2396 {
2289 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2403
2296 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2297 { 2405 {
2298 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2299 2408
2300 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2301 { 2410 {
2302 tileid t = tile [z]; 2411 tileid t = tile [z];
2303 2412
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2414 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2416 need_texid (self, t);
2308 } 2417 }
2309 2418
2310 cell->tile [z] = t; 2419 cell->tile [z] = t;
2311 } 2420 }
2313 } 2422 }
2314 } 2423 }
2315 } 2424 }
2316} 2425}
2317 2426
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2428
2320CFPlus::RW 2429DC::RW
2321new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2322 CODE: 2431 CODE:
2323{ 2432{
2324 STRLEN datalen; 2433 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2437}
2329 OUTPUT: 2438 OUTPUT:
2330 RETVAL 2439 RETVAL
2331 2440
2332CFPlus::RW 2441DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2443 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2445 OUTPUT:
2337 RETVAL 2446 RETVAL
2338 2447
2339# fails on win32: 2448# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2450#void
2342#close (CFPlus::RW self) 2451#close (DC::RW self)
2343# CODE: 2452# CODE:
2344# (self->(close)) (self); 2453# (self->(close)) (self);
2345 2454
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2456
2348PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2349 2458
2350CFPlus::Channel 2459DC::Channel
2351find () 2460find ()
2352 CODE: 2461 CODE:
2353{ 2462{
2354 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2355 2464
2368} 2477}
2369 OUTPUT: 2478 OUTPUT:
2370 RETVAL 2479 RETVAL
2371 2480
2372void 2481void
2373halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2374 CODE: 2483 CODE:
2375 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2376 2485
2377void 2486void
2378expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2379 CODE: 2488 CODE:
2380 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2381 2490
2382void 2491void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2493 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2386 2495
2387int 2496int
2388volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2389 CODE: 2498 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2500 OUTPUT:
2392 RETVAL 2501 RETVAL
2393 2502
2394void 2503void
2395unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2396 CODE: 2505 CODE:
2397 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2398 2507
2399void 2508void
2400set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2401 CODE: 2510 CODE:
2402 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2405 2514
2406void 2515void
2407set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2408 CODE: 2517 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2519
2411void 2520void
2412set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2522 CODE:
2414 2523
2415void 2524void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2526 CODE:
2418{ 2527{
2419 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));
2420 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);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2531}
2423 2532
2424void 2533void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2535 CODE:
2427 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2428 2537
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2539
2431PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2432 2541
2433CFPlus::MixChunk 2542DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2435 CODE: 2544 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2546 OUTPUT:
2438 RETVAL 2547 RETVAL
2439 2548
2440void 2549void
2441DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2442 CODE: 2551 CODE:
2443 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2444 2553
2445int 2554int
2446volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2556 CODE:
2448 if (items > 1) 2557 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2560 OUTPUT:
2452 RETVAL 2561 RETVAL
2453 2562
2454CFPlus::Channel 2563DC::Channel
2455play (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)
2456 CODE: 2565 CODE:
2457{ 2566{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2568
2460 if (RETVAL < 0) 2569 if (RETVAL < 0)
2467 } 2576 }
2468} 2577}
2469 OUTPUT: 2578 OUTPUT:
2470 RETVAL 2579 RETVAL
2471 2580
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2582
2474int 2583int
2475volume (int volume = -1) 2584volume (int volume = -1)
2476 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2477 CODE: 2586 CODE:
2489void 2598void
2490halt () 2599halt ()
2491 CODE: 2600 CODE:
2492 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2493 2602
2494CFPlus::MixMusic 2603DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2496 CODE: 2605 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2607 OUTPUT:
2499 RETVAL 2608 RETVAL
2500 2609
2501void 2610void
2502DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2503 CODE: 2612 CODE:
2504 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2505 2614
2506int 2615int
2507play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2508 CODE: 2617 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2619 OUTPUT:
2511 RETVAL 2620 RETVAL
2512 2621
2513void 2622void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2624 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2626
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2628
2520PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2521 2630
2522BOOT: 2631BOOT:
2523{ 2632{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2634 static const struct {
2526 const char *name; 2635 const char *name;
2527 IV iv; 2636 IV iv;
2528 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2822void 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)
2823 CODE: 2932 CODE:
2824 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2935
2827void 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)
2828 2937
2829void 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)
2830 2939
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2941
2858 2967
2859void glEndList () 2968void glEndList ()
2860 2969
2861void glCallList (int list) 2970void glCallList (int list)
2862 2971
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 2973
2865PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2866 2975
2867void 2976void
2868find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 2981 XPUSHs (self);
2873} 2982}
2874 2983
2875BOOT: 2984BOOT:
2876{ 2985{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 2987
2879 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);
2880 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);
2881 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);
2882 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);
2883} 2992}
2884 2993
2885void 2994void
2886draw (SV *self) 2995draw (SV *self)
2887 CODE: 2996 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3005 double draw_x, draw_y;
2897 3006
2898 if (!SvROK (self)) 3007 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3009
2901 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2902 3011
2903 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3014
2906 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.;
2907 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.;
2908 3017
2909 if (!h || !w) 3018 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines