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.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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 }
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),
624 641
625 const_iv (MIX_DEFAULT_FORMAT), 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),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
626# undef const_iv 670# undef const_iv
627 }; 671 };
628 672
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 703 CODE:
660{ 704{
661 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
664} 713}
665 714
666char *
667SDL_GetError () 715char *SDL_GetError ()
668 716
669int 717int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 718
672void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
673SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
674 733
675void 734void
676SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
677 PPCODE: 736 PPCODE:
678{ 737{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 752
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 755
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 757
702 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
703 while (*m) 759 while (*m)
704 { 760 {
705 if ((*m)->w >= 640 && (*m)->h >= 480)
706 {
707 AV *av = newAV (); 761 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
711 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
712 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713 }
714 767
715 ++m; 768 ++m;
716 } 769 }
717} 770}
718 771
751char * 804char *
752SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
753 806
754int 807int
755SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
756 812
757void 813void
758poll_events () 814poll_events ()
759 PPCODE: 815 PPCODE:
760{ 816{
770 { 826 {
771 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
772 case SDL_KEYUP: 828 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 834 break;
779 835
780 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 855 x = ev.motion.x;
800 y = ev.motion.y; 856 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 858 }
803 859
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 866 }
811 break; 867 break;
812 868
813 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 872
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 883 break;
828 } 884 }
829 885
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 887 }
832} 888}
833 889
834int 890int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 950 }
895 } 951 }
896#endif 952#endif
897} 953}
898 954
899void 955int
900add_font (char *file) 956add_font (char *file)
901 CODE: 957 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
903 961
904void 962void
905load_image_inline (SV *image_) 963load_image_inline (SV *image_)
906 ALIAS: 964 ALIAS:
907 load_image_file = 1 965 load_image_file = 1
993void 1051void
994error (char *message) 1052error (char *message)
995 CODE: 1053 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1055#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1057#endif
1000 1058
1001void 1059void
1002fatal (char *message) 1060fatal (char *message)
1003 CODE: 1061 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1063#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1065#endif
1008 _exit (1); 1066 _exit (1);
1009 1067
1010void 1068void
1011_exit (int retval = 0) 1069_exit (int retval = 0)
1023#if DEBUG 1081#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
1025#endif 1083#endif
1026} 1084}
1027 1085
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1087
1030PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
1031 1089
1032CFPlus::Font 1090DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1092 CODE:
1035{ 1093{
1036 int count; 1094 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1098}
1041 OUTPUT: 1099 OUTPUT:
1042 RETVAL 1100 RETVAL
1043 1101
1044void 1102void
1045DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1046 CODE: 1104 CODE:
1047 pango_font_description_free (self); 1105 pango_font_description_free (self);
1048 1106
1049void 1107void
1050make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1051 PROTOTYPE: $ 1109 PROTOTYPE: $
1052 CODE: 1110 CODE:
1053 default_font = self; 1111 default_font = self;
1054 1112
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1114
1057PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1058 1116
1059void 1117void
1060reset_glyph_cache () 1118glyph_cache_backup ()
1061 PROTOTYPE: 1119 PROTOTYPE:
1062 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1063 tc_clear (); 1127 tc_restore ();
1064 1128
1065CFPlus::Layout 1129DC::Layout
1066new (SV *class) 1130new (SV *class)
1067 CODE: 1131 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1069 1133
1070 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1081 OUTPUT: 1145 OUTPUT:
1082 RETVAL 1146 RETVAL
1083 1147
1084void 1148void
1085DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1086 CODE: 1150 CODE:
1087 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1088 rc_free (self->rc); 1152 rc_free (self->rc);
1089 Safefree (self); 1153 Safefree (self);
1090 1154
1091void 1155void
1092set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1093 CODE: 1157 CODE:
1094{ 1158{
1095 STRLEN textlen; 1159 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1097 1161
1098 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1099} 1163}
1100 1164
1101void 1165void
1102set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1103 CODE: 1167 CODE:
1104{ 1168{
1105 STRLEN textlen; 1169 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1107 1171
1108 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1109} 1173}
1110 1174
1111void 1175void
1112set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1113 CODE: 1177 CODE:
1114{ 1178{
1115 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1181 const char *pos = text;
1152 if (attrs) 1216 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1154} 1218}
1155 1219
1156void 1220void
1157get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1158 PPCODE: 1222 PPCODE:
1159{ 1223{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1225
1162 do 1226 do
1163 { 1227 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1229
1166 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1167 { 1231 {
1168 PangoRectangle extents; 1232 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1241
1178 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1179} 1243}
1180 1244
1181int 1245int
1182has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1183 CODE: 1247 CODE:
1184{ 1248{
1185 int lines = 1; 1249 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1187 1251
1192} 1256}
1193 OUTPUT: 1257 OUTPUT:
1194 RETVAL 1258 RETVAL
1195 1259
1196SV * 1260SV *
1197get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1198 CODE: 1262 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1265 OUTPUT:
1202 RETVAL 1266 RETVAL
1203 1267
1204void 1268void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1269set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1270 CODE:
1207 self->r = r; 1271 self->r = r;
1208 self->g = g; 1272 self->g = g;
1209 self->b = b; 1273 self->b = b;
1210 self->a = a; 1274 self->a = a;
1211 1275
1212void 1276void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1278 CODE:
1215 if (self->font != font) 1279 if (self->font != font)
1216 { 1280 {
1217 self->font = font; 1281 self->font = font;
1218 layout_update_font (self); 1282 layout_update_font (self);
1219 } 1283 }
1220 1284
1221void 1285void
1222set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1223 CODE: 1287 CODE:
1224 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1225 { 1289 {
1226 self->base_height = base_height; 1290 self->base_height = base_height;
1227 layout_update_font (self); 1291 layout_update_font (self);
1228 } 1292 }
1229 1293
1230void 1294void
1231set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1296 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1297 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1298
1235void 1299void
1236set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1237 CODE: 1301 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1303
1240void 1304void
1241set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1242 CODE: 1306 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1308
1245void 1309void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1311 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1253 ); 1317 );
1254 1318
1255void 1319void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1321 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1323
1260void 1324void
1261size (CFPlus::Layout self) 1325size (DC::Layout self)
1262 PPCODE: 1326 PPCODE:
1263{ 1327{
1264 int w, h; 1328 int w, h;
1265 1329
1266 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1271} 1335}
1272 1336
1273int 1337int
1274descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1275 CODE: 1339 CODE:
1276{ 1340{
1277 PangoRectangle rect; 1341 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1281} 1345}
1282 OUTPUT: 1346 OUTPUT:
1283 RETVAL 1347 RETVAL
1284 1348
1285int 1349int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1351 CODE:
1288{ 1352{
1289 int index, trailing; 1353 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1354 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1292} 1356}
1293 OUTPUT: 1357 OUTPUT:
1294 RETVAL 1358 RETVAL
1295 1359
1296void 1360void
1297cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1362 PPCODE:
1299{ 1363{
1300 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1366
1303 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1371}
1308 1372
1309void 1373void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1375 PPCODE:
1312{ 1376{
1313 int line, x; 1377 int line, x;
1314 1378
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1382 --line;
1383#endif
1318 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1387}
1322 1388
1323void 1389void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1391 PPCODE:
1326{ 1392{
1327 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1328 int index, trailing; 1394 int index, trailing;
1329 1395
1330 if (line < 0) 1396 if (line < 0)
1331 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1332 1398
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1335 1401
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1402 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1403
1338 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1411 }
1346} 1412}
1347 1413
1348void 1414void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1416 CODE:
1351 rc_clear (self->rc); 1417 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1353 self->pl, 1419 self->pl,
1354 self->rc, 1420 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1425 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1426 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1427 pango_layout_context_changed (self->pl);
1362 1428
1363void 1429void
1364draw (CFPlus::Layout self) 1430draw (DC::Layout self)
1365 CODE: 1431 CODE:
1366{ 1432{
1367 glEnable (GL_TEXTURE_2D); 1433 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1435 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1443 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1444 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1445 glDisable (GL_TEXTURE_2D);
1380} 1446}
1381 1447
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1449
1384PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1385 1451
1386void 1452void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1532 RETVAL = width > 0;
1467} 1533}
1468 OUTPUT: 1534 OUTPUT:
1469 RETVAL 1535 RETVAL
1470 1536
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1538
1473PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1474 1540
1475CFPlus::Map 1541DC::Map
1476new (SV *class) 1542new (SV *class)
1477 CODE: 1543 CODE:
1478 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1545 RETVAL->x = 0;
1480 RETVAL->y = 0; 1546 RETVAL->y = 0;
1488 RETVAL->row = 0; 1554 RETVAL->row = 0;
1489 OUTPUT: 1555 OUTPUT:
1490 RETVAL 1556 RETVAL
1491 1557
1492void 1558void
1493DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1494 CODE: 1560 CODE:
1495{ 1561{
1496 map_clear (self); 1562 map_clear (self);
1497 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1498 Safefree (self->tex); 1564 Safefree (self->tex);
1499 Safefree (self); 1565 Safefree (self);
1500} 1566}
1501 1567
1502void 1568void
1503resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1570 CODE:
1505 self->w = map_width; 1571 self->w = map_width;
1506 self->h = map_height; 1572 self->h = map_height;
1507 1573
1508void 1574void
1509clear (CFPlus::Map self) 1575clear (DC::Map self)
1510 CODE: 1576 CODE:
1511 map_clear (self); 1577 map_clear (self);
1512 1578
1513void 1579void
1514set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1581 CODE:
1516{ 1582{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1584 need_texid (self, tile);
1519} 1585}
1520 1586
1521void 1587void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1589 CODE:
1524{ 1590{
1525 tileid texid; 1591 tileid texid;
1526 maptex *tex; 1592 maptex *tex;
1527 1593
1540 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1542} 1608}
1543 1609
1544void 1610void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1611set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1612 CODE:
1547{ 1613{
1548 need_texid (self, texid); 1614 need_texid (self, texid);
1549 1615
1550 { 1616 {
1570 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1638}
1573 1639
1574int 1640int
1575ox (CFPlus::Map self) 1641ox (DC::Map self)
1576 ALIAS: 1642 ALIAS:
1577 oy = 1 1643 oy = 1
1578 x = 2 1644 x = 2
1579 y = 3 1645 y = 3
1580 w = 4 1646 w = 4
1591 } 1657 }
1592 OUTPUT: 1658 OUTPUT:
1593 RETVAL 1659 RETVAL
1594 1660
1595void 1661void
1596scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1597 CODE: 1663 CODE:
1598{ 1664{
1599 if (dx > 0) 1665 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1667 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1618 } 1684 }
1619} 1685}
1620 1686
1621SV * 1687SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1689 CODE:
1624{ 1690{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1693 mapcell *cell;
1655 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1656 1722
1657 do 1723 do
1658 { 1724 {
1659 ext = *data++; 1725 ext = *data++;
1660 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1661 1727
1662 if (cmd < 4) 1728 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1665 { 1731 {
1668 } 1734 }
1669 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1672 { 1738 {
1673 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1743
1676 data += *data + 1; 1744 data += *data + 1;
1677 } 1745 }
1678 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1747 cell->flags = *data++;
1716} 1784}
1717 OUTPUT: 1785 OUTPUT:
1718 RETVAL 1786 RETVAL
1719 1787
1720SV * 1788SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1790 CODE:
1723{ 1791{
1724 int x1, x; 1792 int x1, x;
1725 int y1, y; 1793 int y1, y;
1726 int z; 1794 int z;
1771} 1839}
1772 OUTPUT: 1840 OUTPUT:
1773 RETVAL 1841 RETVAL
1774 1842
1775void 1843void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1777 CODE: 1845 CODE:
1778{ 1846{
1779 int x, y, z; 1847 int x, y, z;
1780 1848
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 1852 smooth_key skey;
1785 1853 int pl_x, pl_y;
1854 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1855 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1856 rc_key_t key;
1788 rc_array_t *arr; 1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1789 1860
1790 // thats current max. sorry. 1861 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1793 1864
1848 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1849 1920
1850 if (tile) 1921 if (tile)
1851 { 1922 {
1852 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1853 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1854 1926
1855 if (key.texname != tex.name) 1927 if (key.texname != tex.name)
1856 { 1928 {
1857 if (!tex.name) 1929 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1859 1931
1860 key.texname = tex.name; 1932 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 1933 arr = rc_array (rc, &key);
1862 } 1934 }
1863 1935
1864 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1866 1943
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 1948
1872 if (cell->flags && z == 2) 1949 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 1950 {
1874 // overlays such as the speech bubble, probably more to come 1951 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 1952 if (cell->flags & 1)
1876 { 1953 {
1877 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
2016 } 2093 }
2017 2094
2018 hv_clear (smooth); 2095 hv_clear (smooth);
2019 } 2096 }
2020 2097
2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
2103
2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
2112 rc_draw (rc);
2113 }
2114
2021 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2022 rc_free (rc); 2116 rc_free (rc);
2023 2117
2024 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
2052 } 2146 }
2053 } 2147 }
2054} 2148}
2055 2149
2056void 2150void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2152 CODE:
2059{ 2153{
2060 static float color[16][3] = { 2154 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2114} 2208}
2115 2209
2116void 2210void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2211fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2212 PPCODE:
2119{ 2213{
2120 int x, y; 2214 int x, y;
2121 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2195} 2289}
2196 2290
2197SV * 2291SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2292get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2293 CODE:
2200{ 2294{
2201 int x, y, x1, y1; 2295 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2354 else
2261 *data++ = 0; 2355 *data++ = 0;
2262 } 2356 }
2263 } 2357 }
2264 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2265 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2267 RETVAL = data_sv; 2366 RETVAL = data_sv;
2268} 2367}
2269 OUTPUT: 2368 OUTPUT:
2270 RETVAL 2369 RETVAL
2271 2370
2272void 2371void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2373 PPCODE:
2275{ 2374{
2276 int x, y, z; 2375 int x, y, z;
2277 int w, h; 2376 int w, h;
2278 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2279 2388
2280 if (*data++ != 0) 2389 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2282 2391
2283 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2298 { 2407 {
2299 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2300 2409
2301 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2302 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2303 uint8_t flags = *data++; 2417 flags = *data++;
2304 2418
2305 if (flags) 2419 if (flags)
2306 { 2420 {
2307 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2427
2314 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2315 { 2429 {
2316 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2317 2432
2318 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2319 { 2434 {
2320 tileid t = tile [z]; 2435 tileid t = tile [z];
2321 2436
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2438 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2440 need_texid (self, t);
2326 } 2441 }
2327 2442
2328 cell->tile [z] = t; 2443 cell->tile [z] = t;
2329 } 2444 }
2331 } 2446 }
2332 } 2447 }
2333 } 2448 }
2334} 2449}
2335 2450
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2452
2338CFPlus::RW 2453DC::RW
2339new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2340 CODE: 2455 CODE:
2341{ 2456{
2342 STRLEN datalen; 2457 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2461}
2347 OUTPUT: 2462 OUTPUT:
2348 RETVAL 2463 RETVAL
2349 2464
2350CFPlus::RW 2465DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2467 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2469 OUTPUT:
2355 RETVAL 2470 RETVAL
2356 2471
2357# fails on win32: 2472# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2473# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2474#void
2360#close (CFPlus::RW self) 2475#close (DC::RW self)
2361# CODE: 2476# CODE:
2362# (self->(close)) (self); 2477# (self->(close)) (self);
2363 2478
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2480
2366PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2367 2482
2368CFPlus::Channel 2483DC::Channel
2369find () 2484find ()
2370 CODE: 2485 CODE:
2371{ 2486{
2372 RETVAL = Mix_GroupAvailable (-1); 2487 RETVAL = Mix_GroupAvailable (-1);
2373 2488
2386} 2501}
2387 OUTPUT: 2502 OUTPUT:
2388 RETVAL 2503 RETVAL
2389 2504
2390void 2505void
2391halt (CFPlus::Channel self) 2506halt (DC::Channel self)
2392 CODE: 2507 CODE:
2393 Mix_HaltChannel (self); 2508 Mix_HaltChannel (self);
2394 2509
2395void 2510void
2396expire (CFPlus::Channel self, int ticks = -1) 2511expire (DC::Channel self, int ticks = -1)
2397 CODE: 2512 CODE:
2398 Mix_ExpireChannel (self, ticks); 2513 Mix_ExpireChannel (self, ticks);
2399 2514
2400void 2515void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2516fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2517 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2518 Mix_FadeOutChannel (self, ticks);
2404 2519
2405int 2520int
2406volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2407 CODE: 2522 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2524 OUTPUT:
2410 RETVAL 2525 RETVAL
2411 2526
2412void 2527void
2413unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2414 CODE: 2529 CODE:
2415 Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2416 2531
2417void 2532void
2418set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2419 CODE: 2534 CODE:
2420 left = CLAMP (left , 0, 255); 2535 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2536 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2423 2538
2424void 2539void
2425set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2426 CODE: 2541 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2543
2429void 2544void
2430set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2546 CODE:
2432 2547
2433void 2548void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2550 CODE:
2436{ 2551{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2555}
2441 2556
2442void 2557void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2559 CODE:
2445 Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2446 2561
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2563
2449PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2450 2565
2451CFPlus::MixChunk 2566DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2453 CODE: 2568 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2570 OUTPUT:
2456 RETVAL 2571 RETVAL
2457 2572
2458void 2573void
2459DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2460 CODE: 2575 CODE:
2461 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2462 2577
2463int 2578int
2464volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2580 CODE:
2466 if (items > 1) 2581 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2582 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2584 OUTPUT:
2470 RETVAL 2585 RETVAL
2471 2586
2472CFPlus::Channel 2587DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2588play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2589 CODE:
2475{ 2590{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2592
2478 if (RETVAL < 0) 2593 if (RETVAL < 0)
2485 } 2600 }
2486} 2601}
2487 OUTPUT: 2602 OUTPUT:
2488 RETVAL 2603 RETVAL
2489 2604
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2606
2492int 2607int
2493volume (int volume = -1) 2608volume (int volume = -1)
2494 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2495 CODE: 2610 CODE:
2507void 2622void
2508halt () 2623halt ()
2509 CODE: 2624 CODE:
2510 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2511 2626
2512CFPlus::MixMusic 2627DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2514 CODE: 2629 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2631 OUTPUT:
2517 RETVAL 2632 RETVAL
2518 2633
2519void 2634void
2520DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2521 CODE: 2636 CODE:
2522 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2523 2638
2524int 2639int
2525play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2526 CODE: 2641 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2643 OUTPUT:
2529 RETVAL 2644 RETVAL
2530 2645
2531void 2646void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2648 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2650
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2652
2538PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2539 2654
2540BOOT: 2655BOOT:
2541{ 2656{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2658 static const struct {
2544 const char *name; 2659 const char *name;
2545 IV iv; 2660 IV iv;
2546 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 2956 CODE:
2842 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 2959
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 2961
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 2963
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 2965
2876 2991
2877void glEndList () 2992void glEndList ()
2878 2993
2879void glCallList (int list) 2994void glCallList (int list)
2880 2995
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 2997
2883PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2884 2999
2885void 3000void
2886find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3005 XPUSHs (self);
2891} 3006}
2892 3007
2893BOOT: 3008BOOT:
2894{ 3009{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3011
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3016}
2902 3017
2903void 3018void
2904draw (SV *self) 3019draw (SV *self)
2905 CODE: 3020 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3029 double draw_x, draw_y;
2915 3030
2916 if (!SvROK (self)) 3031 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3033
2919 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2920 3035
2921 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3038
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3041
2927 if (!h || !w) 3042 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines