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.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 }
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),
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)
624# undef const_iv 670# undef const_iv
625 }; 671 };
626 672
627 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; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 703 CODE:
658{ 704{
659 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
660 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);
661 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
662} 713}
663 714
664char *
665SDL_GetError () 715char *SDL_GetError ()
666 716
667int 717int SDL_Init (U32 flags)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 718
670void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
671SDL_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
672 733
673void 734void
674SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
675 PPCODE: 736 PPCODE:
676{ 737{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 752
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 755
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 757
700 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
701 while (*m) 759 while (*m)
702 { 760 {
703 if ((*m)->w >= 640 && (*m)->h >= 480)
704 {
705 AV *av = newAV (); 761 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
709 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
710 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 }
712 767
713 ++m; 768 ++m;
714 } 769 }
715} 770}
716 771
732 787
733 if (RETVAL) 788 if (RETVAL)
734 { 789 {
735 av_clear (texture_av); 790 av_clear (texture_av);
736 791
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 794#include "glfunc.h"
740#undef GL_FUNC 795#undef GL_FUNC
741 } 796 }
742} 797}
749char * 804char *
750SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
751 806
752int 807int
753SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
754 812
755void 813void
756poll_events () 814poll_events ()
757 PPCODE: 815 PPCODE:
758{ 816{
768 { 826 {
769 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
770 case SDL_KEYUP: 828 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 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);
774 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 */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 834 break;
777 835
778 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 855 x = ev.motion.x;
798 y = ev.motion.y; 856 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 858 }
801 859
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 866 }
809 break; 867 break;
810 868
811 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 872
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 883 break;
826 } 884 }
827 885
828 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))));
829 } 887 }
830} 888}
831 889
832int 890int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 892 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
895
896void
897Mix_QuerySpec ()
898 PPCODE:
899{
900 int freq, channels;
901 Uint16 format;
902
903 if (Mix_QuerySpec (&freq, &format, &channels))
904 {
905 EXTEND (SP, 3);
906 PUSHs (sv_2mortal (newSViv (freq)));
907 PUSHs (sv_2mortal (newSViv (format)));
908 PUSHs (sv_2mortal (newSViv (channels)));
909 }
910}
837 911
838void 912void
839Mix_CloseAudio () 913Mix_CloseAudio ()
840 914
841int 915int
876 } 950 }
877 } 951 }
878#endif 952#endif
879} 953}
880 954
881void 955int
882add_font (char *file) 956add_font (char *file)
883 CODE: 957 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
885 961
886void 962void
887load_image_inline (SV *image_) 963load_image_inline (SV *image_)
888 ALIAS: 964 ALIAS:
889 load_image_file = 1 965 load_image_file = 1
975void 1051void
976error (char *message) 1052error (char *message)
977 CODE: 1053 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1055#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1057#endif
982 1058
983void 1059void
984fatal (char *message) 1060fatal (char *message)
985 CODE: 1061 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1063#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1065#endif
990 _exit (1); 1066 _exit (1);
991 1067
992void 1068void
993_exit (int retval = 0) 1069_exit (int retval = 0)
1005#if DEBUG 1081#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
1007#endif 1083#endif
1008} 1084}
1009 1085
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1087
1012PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
1013 1089
1014CFPlus::Font 1090DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1092 CODE:
1017{ 1093{
1018 int count; 1094 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1098}
1023 OUTPUT: 1099 OUTPUT:
1024 RETVAL 1100 RETVAL
1025 1101
1026void 1102void
1027DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1028 CODE: 1104 CODE:
1029 pango_font_description_free (self); 1105 pango_font_description_free (self);
1030 1106
1031void 1107void
1032make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1033 PROTOTYPE: $ 1109 PROTOTYPE: $
1034 CODE: 1110 CODE:
1035 default_font = self; 1111 default_font = self;
1036 1112
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1114
1039PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1040 1116
1041void 1117void
1042reset_glyph_cache () 1118glyph_cache_backup ()
1043 PROTOTYPE: 1119 PROTOTYPE:
1044 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1045 tc_clear (); 1127 tc_restore ();
1046 1128
1047CFPlus::Layout 1129DC::Layout
1048new (SV *class) 1130new (SV *class)
1049 CODE: 1131 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1051 1133
1052 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1063 OUTPUT: 1145 OUTPUT:
1064 RETVAL 1146 RETVAL
1065 1147
1066void 1148void
1067DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1068 CODE: 1150 CODE:
1069 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1070 rc_free (self->rc); 1152 rc_free (self->rc);
1071 Safefree (self); 1153 Safefree (self);
1072 1154
1073void 1155void
1074set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1075 CODE: 1157 CODE:
1076{ 1158{
1077 STRLEN textlen; 1159 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1079 1161
1080 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1081} 1163}
1082 1164
1083void 1165void
1084set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1085 CODE: 1167 CODE:
1086{ 1168{
1087 STRLEN textlen; 1169 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1089 1171
1090 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1091} 1173}
1092 1174
1093void 1175void
1094set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1095 CODE: 1177 CODE:
1096{ 1178{
1097 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1181 const char *pos = text;
1134 if (attrs) 1216 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1136} 1218}
1137 1219
1138void 1220void
1139get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1140 PPCODE: 1222 PPCODE:
1141{ 1223{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1225
1144 do 1226 do
1145 { 1227 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1229
1148 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1149 { 1231 {
1150 PangoRectangle extents; 1232 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1241
1160 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1161} 1243}
1162 1244
1163int 1245int
1164has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1165 CODE: 1247 CODE:
1166{ 1248{
1167 int lines = 1; 1249 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1169 1251
1174} 1256}
1175 OUTPUT: 1257 OUTPUT:
1176 RETVAL 1258 RETVAL
1177 1259
1178SV * 1260SV *
1179get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1180 CODE: 1262 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1265 OUTPUT:
1184 RETVAL 1266 RETVAL
1185 1267
1186void 1268void
1187set_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.)
1188 CODE: 1270 CODE:
1189 self->r = r; 1271 self->r = r;
1190 self->g = g; 1272 self->g = g;
1191 self->b = b; 1273 self->b = b;
1192 self->a = a; 1274 self->a = a;
1193 1275
1194void 1276void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1278 CODE:
1197 if (self->font != font) 1279 if (self->font != font)
1198 { 1280 {
1199 self->font = font; 1281 self->font = font;
1200 layout_update_font (self); 1282 layout_update_font (self);
1201 } 1283 }
1202 1284
1203void 1285void
1204set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1205 CODE: 1287 CODE:
1206 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1207 { 1289 {
1208 self->base_height = base_height; 1290 self->base_height = base_height;
1209 layout_update_font (self); 1291 layout_update_font (self);
1210 } 1292 }
1211 1293
1212void 1294void
1213set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1296 CODE:
1215 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);
1216 1298
1217void 1299void
1218set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1219 CODE: 1301 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1303
1222void 1304void
1223set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1224 CODE: 1306 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1308
1227void 1309void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1311 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1235 ); 1317 );
1236 1318
1237void 1319void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1321 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1323
1242void 1324void
1243size (CFPlus::Layout self) 1325size (DC::Layout self)
1244 PPCODE: 1326 PPCODE:
1245{ 1327{
1246 int w, h; 1328 int w, h;
1247 1329
1248 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1253} 1335}
1254 1336
1255int 1337int
1256descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1257 CODE: 1339 CODE:
1258{ 1340{
1259 PangoRectangle rect; 1341 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1263} 1345}
1264 OUTPUT: 1346 OUTPUT:
1265 RETVAL 1347 RETVAL
1266 1348
1267int 1349int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1351 CODE:
1270{ 1352{
1271 int index, trailing; 1353 int index, trailing;
1272 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);
1273 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1274} 1356}
1275 OUTPUT: 1357 OUTPUT:
1276 RETVAL 1358 RETVAL
1277 1359
1278void 1360void
1279cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1362 PPCODE:
1281{ 1363{
1282 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1366
1285 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1371}
1290 1372
1291void 1373void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1375 PPCODE:
1294{ 1376{
1295 int line, x; 1377 int line, x;
1296 1378
1297 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)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1382 --line;
1383#endif
1300 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1387}
1304 1388
1305void 1389void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1391 PPCODE:
1308{ 1392{
1309 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1310 int index, trailing; 1394 int index, trailing;
1311 1395
1312 if (line < 0) 1396 if (line < 0)
1313 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1314 1398
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1317 1401
1318 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);
1319 1403
1320 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1411 }
1328} 1412}
1329 1413
1330void 1414void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1416 CODE:
1333 rc_clear (self->rc); 1417 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1335 self->pl, 1419 self->pl,
1336 self->rc, 1420 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1425 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1426 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1427 pango_layout_context_changed (self->pl);
1344 1428
1345void 1429void
1346draw (CFPlus::Layout self) 1430draw (DC::Layout self)
1347 CODE: 1431 CODE:
1348{ 1432{
1349 glEnable (GL_TEXTURE_2D); 1433 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1435 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1443 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1444 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1445 glDisable (GL_TEXTURE_2D);
1362} 1446}
1363 1447
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1449
1366PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1367 1451
1368void 1452void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1532 RETVAL = width > 0;
1449} 1533}
1450 OUTPUT: 1534 OUTPUT:
1451 RETVAL 1535 RETVAL
1452 1536
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1538
1455PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1456 1540
1457CFPlus::Map 1541DC::Map
1458new (SV *class) 1542new (SV *class)
1459 CODE: 1543 CODE:
1460 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1545 RETVAL->x = 0;
1462 RETVAL->y = 0; 1546 RETVAL->y = 0;
1470 RETVAL->row = 0; 1554 RETVAL->row = 0;
1471 OUTPUT: 1555 OUTPUT:
1472 RETVAL 1556 RETVAL
1473 1557
1474void 1558void
1475DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1476 CODE: 1560 CODE:
1477{ 1561{
1478 map_clear (self); 1562 map_clear (self);
1479 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1480 Safefree (self->tex); 1564 Safefree (self->tex);
1481 Safefree (self); 1565 Safefree (self);
1482} 1566}
1483 1567
1484void 1568void
1485resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1570 CODE:
1487 self->w = map_width; 1571 self->w = map_width;
1488 self->h = map_height; 1572 self->h = map_height;
1489 1573
1490void 1574void
1491clear (CFPlus::Map self) 1575clear (DC::Map self)
1492 CODE: 1576 CODE:
1493 map_clear (self); 1577 map_clear (self);
1494 1578
1495void 1579void
1496set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1581 CODE:
1498{ 1582{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1584 need_texid (self, tile);
1501} 1585}
1502 1586
1503void 1587void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1589 CODE:
1506{ 1590{
1507 tileid texid; 1591 tileid texid;
1508 maptex *tex; 1592 maptex *tex;
1509 1593
1522 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1524} 1608}
1525 1609
1526void 1610void
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) 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)
1528 CODE: 1612 CODE:
1529{ 1613{
1530 need_texid (self, texid); 1614 need_texid (self, texid);
1531 1615
1532 { 1616 {
1552 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1638}
1555 1639
1556int 1640int
1557ox (CFPlus::Map self) 1641ox (DC::Map self)
1558 ALIAS: 1642 ALIAS:
1559 oy = 1 1643 oy = 1
1560 x = 2 1644 x = 2
1561 y = 3 1645 y = 3
1562 w = 4 1646 w = 4
1573 } 1657 }
1574 OUTPUT: 1658 OUTPUT:
1575 RETVAL 1659 RETVAL
1576 1660
1577void 1661void
1578scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1579 CODE: 1663 CODE:
1580{ 1664{
1581 if (dx > 0) 1665 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1667 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1600 } 1684 }
1601} 1685}
1602 1686
1603SV * 1687SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1689 CODE:
1606{ 1690{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1693 mapcell *cell;
1637 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1638 1722
1639 do 1723 do
1640 { 1724 {
1641 ext = *data++; 1725 ext = *data++;
1642 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1643 1727
1644 if (cmd < 4) 1728 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1647 { 1731 {
1650 } 1734 }
1651 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1654 { 1738 {
1655 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1656 ; // 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);
1657 1743
1658 data += *data + 1; 1744 data += *data + 1;
1659 } 1745 }
1660 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1747 cell->flags = *data++;
1698} 1784}
1699 OUTPUT: 1785 OUTPUT:
1700 RETVAL 1786 RETVAL
1701 1787
1702SV * 1788SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1790 CODE:
1705{ 1791{
1706 int x1, x; 1792 int x1, x;
1707 int y1, y; 1793 int y1, y;
1708 int z; 1794 int z;
1753} 1839}
1754 OUTPUT: 1840 OUTPUT:
1755 RETVAL 1841 RETVAL
1756 1842
1757void 1843void
1758draw (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)
1759 CODE: 1845 CODE:
1760{ 1846{
1761 int x, y, z; 1847 int x, y, z;
1762 1848
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 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
1765 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)
1766 smooth_key skey; 1852 smooth_key skey;
1767 1853 int pl_x, pl_y;
1854 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1855 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1856 rc_key_t key;
1770 rc_array_t *arr; 1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1771 1860
1772 // thats current max. sorry. 1861 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1775 1864
1830 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1831 1920
1832 if (tile) 1921 if (tile)
1833 { 1922 {
1834 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1835 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1836 1926
1837 if (key.texname != tex.name) 1927 if (key.texname != tex.name)
1838 { 1928 {
1839 if (!tex.name) 1929 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1841 1931
1842 key.texname = tex.name; 1932 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 1933 arr = rc_array (rc, &key);
1844 } 1934 }
1845 1935
1846 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1848 1943
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 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);
1851 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);
1852 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);
1853 1948
1854 if (cell->flags && z == 2) 1949 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 1950 {
1856 // overlays such as the speech bubble, probably more to come 1951 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 1952 if (cell->flags & 1)
1858 { 1953 {
1859 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1998 } 2093 }
1999 2094
2000 hv_clear (smooth); 2095 hv_clear (smooth);
2001 } 2096 }
2002 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
2003 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2004 rc_free (rc); 2116 rc_free (rc);
2005 2117
2006 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
2034 } 2146 }
2035 } 2147 }
2036} 2148}
2037 2149
2038void 2150void
2039draw_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)
2040 CODE: 2152 CODE:
2041{ 2153{
2042 static float color[16][3] = { 2154 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2096} 2208}
2097 2209
2098void 2210void
2099fow_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)
2100 PPCODE: 2212 PPCODE:
2101{ 2213{
2102 int x, y; 2214 int x, y;
2103 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2177} 2289}
2178 2290
2179SV * 2291SV *
2180get_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)
2181 CODE: 2293 CODE:
2182{ 2294{
2183 int x, y, x1, y1; 2295 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2354 else
2243 *data++ = 0; 2355 *data++ = 0;
2244 } 2356 }
2245 } 2357 }
2246 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 {
2247 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2249 RETVAL = data_sv; 2366 RETVAL = data_sv;
2250} 2367}
2251 OUTPUT: 2368 OUTPUT:
2252 RETVAL 2369 RETVAL
2253 2370
2254void 2371void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2373 PPCODE:
2257{ 2374{
2258 int x, y, z; 2375 int x, y, z;
2259 int w, h; 2376 int w, h;
2260 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;
2261 2388
2262 if (*data++ != 0) 2389 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2264 2391
2265 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2280 { 2407 {
2281 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2282 2409
2283 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2284 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2285 uint8_t flags = *data++; 2417 flags = *data++;
2286 2418
2287 if (flags) 2419 if (flags)
2288 { 2420 {
2289 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2427
2296 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2297 { 2429 {
2298 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2299 2432
2300 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2301 { 2434 {
2302 tileid t = tile [z]; 2435 tileid t = tile [z];
2303 2436
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2438 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2440 need_texid (self, t);
2308 } 2441 }
2309 2442
2310 cell->tile [z] = t; 2443 cell->tile [z] = t;
2311 } 2444 }
2313 } 2446 }
2314 } 2447 }
2315 } 2448 }
2316} 2449}
2317 2450
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2452
2320CFPlus::RW 2453DC::RW
2321new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2322 CODE: 2455 CODE:
2323{ 2456{
2324 STRLEN datalen; 2457 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2461}
2329 OUTPUT: 2462 OUTPUT:
2330 RETVAL 2463 RETVAL
2331 2464
2332CFPlus::RW 2465DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2467 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2469 OUTPUT:
2337 RETVAL 2470 RETVAL
2338 2471
2339# fails on win32: 2472# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2473# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2474#void
2342#close (CFPlus::RW self) 2475#close (DC::RW self)
2343# CODE: 2476# CODE:
2344# (self->(close)) (self); 2477# (self->(close)) (self);
2345 2478
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2480
2348PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2349 2482
2350CFPlus::Channel 2483DC::Channel
2351find () 2484find ()
2352 CODE: 2485 CODE:
2353{ 2486{
2354 RETVAL = Mix_GroupAvailable (-1); 2487 RETVAL = Mix_GroupAvailable (-1);
2355 2488
2368} 2501}
2369 OUTPUT: 2502 OUTPUT:
2370 RETVAL 2503 RETVAL
2371 2504
2372void 2505void
2373halt (CFPlus::Channel self) 2506halt (DC::Channel self)
2374 CODE: 2507 CODE:
2375 Mix_HaltChannel (self); 2508 Mix_HaltChannel (self);
2376 2509
2377void 2510void
2378expire (CFPlus::Channel self, int ticks = -1) 2511expire (DC::Channel self, int ticks = -1)
2379 CODE: 2512 CODE:
2380 Mix_ExpireChannel (self, ticks); 2513 Mix_ExpireChannel (self, ticks);
2381 2514
2382void 2515void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2516fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2517 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2518 Mix_FadeOutChannel (self, ticks);
2386 2519
2387int 2520int
2388volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2389 CODE: 2522 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2524 OUTPUT:
2392 RETVAL 2525 RETVAL
2393 2526
2394void 2527void
2395unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2396 CODE: 2529 CODE:
2397 Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2398 2531
2399void 2532void
2400set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2401 CODE: 2534 CODE:
2402 left = CLAMP (left , 0, 255); 2535 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2536 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2405 2538
2406void 2539void
2407set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2408 CODE: 2541 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2543
2411void 2544void
2412set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2546 CODE:
2414 2547
2415void 2548void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2550 CODE:
2418{ 2551{
2419 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));
2420 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);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2555}
2423 2556
2424void 2557void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2559 CODE:
2427 Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2428 2561
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2563
2431PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2432 2565
2433CFPlus::MixChunk 2566DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2435 CODE: 2568 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2570 OUTPUT:
2438 RETVAL 2571 RETVAL
2439 2572
2440void 2573void
2441DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2442 CODE: 2575 CODE:
2443 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2444 2577
2445int 2578int
2446volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2580 CODE:
2448 if (items > 1) 2581 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2582 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2584 OUTPUT:
2452 RETVAL 2585 RETVAL
2453 2586
2454CFPlus::Channel 2587DC::Channel
2455play (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)
2456 CODE: 2589 CODE:
2457{ 2590{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2592
2460 if (RETVAL < 0) 2593 if (RETVAL < 0)
2467 } 2600 }
2468} 2601}
2469 OUTPUT: 2602 OUTPUT:
2470 RETVAL 2603 RETVAL
2471 2604
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2606
2474int 2607int
2475volume (int volume = -1) 2608volume (int volume = -1)
2476 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2477 CODE: 2610 CODE:
2489void 2622void
2490halt () 2623halt ()
2491 CODE: 2624 CODE:
2492 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2493 2626
2494CFPlus::MixMusic 2627DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2496 CODE: 2629 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2631 OUTPUT:
2499 RETVAL 2632 RETVAL
2500 2633
2501void 2634void
2502DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2503 CODE: 2636 CODE:
2504 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2505 2638
2506int 2639int
2507play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2508 CODE: 2641 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2643 OUTPUT:
2511 RETVAL 2644 RETVAL
2512 2645
2513void 2646void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2648 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2650
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2652
2520PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2521 2654
2522BOOT: 2655BOOT:
2523{ 2656{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2658 static const struct {
2526 const char *name; 2659 const char *name;
2527 IV iv; 2660 IV iv;
2528 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2662# 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) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 2956 CODE:
2824 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2959
2827void 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)
2828 2961
2829void 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)
2830 2963
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2965
2858 2991
2859void glEndList () 2992void glEndList ()
2860 2993
2861void glCallList (int list) 2994void glCallList (int list)
2862 2995
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 2997
2865PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2866 2999
2867void 3000void
2868find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3005 XPUSHs (self);
2873} 3006}
2874 3007
2875BOOT: 3008BOOT:
2876{ 3009{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3011
2879 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);
2880 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);
2881 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);
2882 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);
2883} 3016}
2884 3017
2885void 3018void
2886draw (SV *self) 3019draw (SV *self)
2887 CODE: 3020 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3029 double draw_x, draw_y;
2897 3030
2898 if (!SvROK (self)) 3031 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3033
2901 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2902 3035
2903 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3038
2906 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.;
2907 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.;
2908 3041
2909 if (!h || !w) 3042 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines