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.268 by root, Sun Jul 20 02:57:43 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);
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
360 mapcell *cell; 387 mapcell *cell;
361 388
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
498 return 0; 522 return 0;
499 523
500 return 1; 524 return 1;
501} 525}
502 526
503MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
504 528
505PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
506 530
507BOOT: 531BOOT:
508{ 532{
509 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 534 static const struct {
511 const char *name; 535 const char *name;
512 IV iv; 536 IV iv;
513 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
648
649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL)
624# undef const_iv 677# undef const_iv
625 }; 678 };
626 679
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 710 CODE:
658{ 711{
659 opengl_fontmap = pango_opengl_font_map_new (); 712 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 713 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); 714 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
715 /*pango_context_set_font_description (opengl_context, default_font);*/
716#if PANGO_VERSION_CHECK (1, 15, 2)
717 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
718 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
719#endif
662} 720}
663 721
664char *
665SDL_GetError () 722char *SDL_GetError ()
666 723
667int 724int SDL_Init (U32 flags)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 725
670void 726int SDL_InitSubSystem (U32 flags)
727
728void SDL_QuitSubSystem (U32 flags)
729
671SDL_Quit () 730void SDL_Quit ()
731
732int SDL_GL_SetAttribute (int attr, int value)
733
734int SDL_GL_GetAttribute (int attr)
735 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL))
737 XSRETURN_UNDEF;
738 OUTPUT:
739 RETVAL
672 740
673void 741void
674SDL_ListModes (int rgb, int alpha) 742SDL_ListModes (int rgb, int alpha)
675 PPCODE: 743 PPCODE:
676{ 744{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 757 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 759
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 760 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); 761 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 762
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 763 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 764
700 if (m && m != (SDL_Rect **)-1) 765 if (m && m != (SDL_Rect **)-1)
701 while (*m) 766 while (*m)
702 { 767 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 768 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 769 {
705 AV *av = newAV (); 770 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 771 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 772 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 773 av_push (av, newSViv (rgb));
732 797
733 if (RETVAL) 798 if (RETVAL)
734 { 799 {
735 av_clear (texture_av); 800 av_clear (texture_av);
736 801
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 804#include "glfunc.h"
740#undef GL_FUNC 805#undef GL_FUNC
741 } 806 }
742} 807}
749char * 814char *
750SDL_GetKeyName (int sym) 815SDL_GetKeyName (int sym)
751 816
752int 817int
753SDL_GetAppState () 818SDL_GetAppState ()
819
820int
821SDL_GetModState ()
754 822
755void 823void
756poll_events () 824poll_events ()
757 PPCODE: 825 PPCODE:
758{ 826{
768 { 836 {
769 case SDL_KEYDOWN: 837 case SDL_KEYDOWN:
770 case SDL_KEYUP: 838 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 841 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 */ 842 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); 843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 844 break;
777 845
778 case SDL_ACTIVEEVENT: 846 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 865 x = ev.motion.x;
798 y = ev.motion.y; 866 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 868 }
801 869
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 871 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 872 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 873 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 874 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 875 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 876 }
809 break; 877 break;
810 878
811 case SDL_MOUSEBUTTONDOWN: 879 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 880 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 881 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 882
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 883 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 884 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 885 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 886 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 891 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 892 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 893 break;
826 } 894 }
827 895
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 897 }
830} 898}
831 899
832int 900int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 902 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 903 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 904 Mix_ChannelFinished (channel_finished);
905
906void
907Mix_QuerySpec ()
908 PPCODE:
909{
910 int freq, channels;
911 Uint16 format;
912
913 if (Mix_QuerySpec (&freq, &format, &channels))
914 {
915 EXTEND (SP, 3);
916 PUSHs (sv_2mortal (newSViv (freq)));
917 PUSHs (sv_2mortal (newSViv (format)));
918 PUSHs (sv_2mortal (newSViv (channels)));
919 }
920}
837 921
838void 922void
839Mix_CloseAudio () 923Mix_CloseAudio ()
840 924
841int 925int
876 } 960 }
877 } 961 }
878#endif 962#endif
879} 963}
880 964
881void 965int
882add_font (char *file) 966add_font (char *file)
883 CODE: 967 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT:
970 RETVAL
885 971
886void 972void
887load_image_inline (SV *image_) 973load_image_inline (SV *image_)
888 ALIAS: 974 ALIAS:
889 load_image_file = 1 975 load_image_file = 1
975void 1061void
976error (char *message) 1062error (char *message)
977 CODE: 1063 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1064 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1065#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1066 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1067#endif
982 1068
983void 1069void
984fatal (char *message) 1070fatal (char *message)
985 CODE: 1071 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1072 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1073#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1075#endif
990 _exit (1); 1076 _exit (1);
991 1077
992void 1078void
993_exit (int retval = 0) 1079_exit (int retval = 0)
1005#if DEBUG 1091#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1092 VALGRIND_DO_LEAK_CHECK;
1007#endif 1093#endif
1008} 1094}
1009 1095
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1096MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1097
1012PROTOTYPES: DISABLE 1098PROTOTYPES: DISABLE
1013 1099
1014CFPlus::Font 1100DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1101new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1102 CODE:
1017{ 1103{
1018 int count; 1104 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1108}
1023 OUTPUT: 1109 OUTPUT:
1024 RETVAL 1110 RETVAL
1025 1111
1026void 1112void
1027DESTROY (CFPlus::Font self) 1113DESTROY (DC::Font self)
1028 CODE: 1114 CODE:
1029 pango_font_description_free (self); 1115 pango_font_description_free (self);
1030 1116
1031void 1117void
1032make_default (CFPlus::Font self) 1118make_default (DC::Font self)
1033 PROTOTYPE: $ 1119 PROTOTYPE: $
1034 CODE: 1120 CODE:
1035 default_font = self; 1121 default_font = self;
1036 1122
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1123MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1124
1039PROTOTYPES: DISABLE 1125PROTOTYPES: DISABLE
1040 1126
1041void 1127void
1042reset_glyph_cache () 1128glyph_cache_backup ()
1043 PROTOTYPE: 1129 PROTOTYPE:
1044 CODE: 1130 CODE:
1131 tc_backup ();
1132
1133void
1134glyph_cache_restore ()
1135 PROTOTYPE:
1136 CODE:
1045 tc_clear (); 1137 tc_restore ();
1046 1138
1047CFPlus::Layout 1139DC::Layout
1048new (SV *class) 1140new (SV *class)
1049 CODE: 1141 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1142 New (0, RETVAL, 1, struct cf_layout);
1051 1143
1052 RETVAL->pl = pango_layout_new (opengl_context); 1144 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1154 layout_update_font (RETVAL);
1063 OUTPUT: 1155 OUTPUT:
1064 RETVAL 1156 RETVAL
1065 1157
1066void 1158void
1067DESTROY (CFPlus::Layout self) 1159DESTROY (DC::Layout self)
1068 CODE: 1160 CODE:
1069 g_object_unref (self->pl); 1161 g_object_unref (self->pl);
1070 rc_free (self->rc); 1162 rc_free (self->rc);
1071 Safefree (self); 1163 Safefree (self);
1072 1164
1073void 1165void
1074set_text (CFPlus::Layout self, SV *text_) 1166set_text (DC::Layout self, SV *text_)
1075 CODE: 1167 CODE:
1076{ 1168{
1077 STRLEN textlen; 1169 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1079 1171
1080 pango_layout_set_text (self->pl, text, textlen); 1172 pango_layout_set_text (self->pl, text, textlen);
1081} 1173}
1082 1174
1083void 1175void
1084set_markup (CFPlus::Layout self, SV *text_) 1176set_markup (DC::Layout self, SV *text_)
1085 CODE: 1177 CODE:
1086{ 1178{
1087 STRLEN textlen; 1179 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1180 char *text = SvPVutf8 (text_, textlen);
1089 1181
1090 pango_layout_set_markup (self->pl, text, textlen); 1182 pango_layout_set_markup (self->pl, text, textlen);
1091} 1183}
1092 1184
1093void 1185void
1094set_shapes (CFPlus::Layout self, ...) 1186set_shapes (DC::Layout self, ...)
1095 CODE: 1187 CODE:
1096{ 1188{
1097 PangoAttrList *attrs = 0; 1189 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1190 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1191 const char *pos = text;
1134 if (attrs) 1226 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1227 pango_layout_set_attributes (self->pl, attrs);
1136} 1228}
1137 1229
1138void 1230void
1139get_shapes (CFPlus::Layout self) 1231get_shapes (DC::Layout self)
1140 PPCODE: 1232 PPCODE:
1141{ 1233{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1234 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1235
1144 do 1236 do
1145 { 1237 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1238 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1239
1148 if (run && shape_attr_p (run)) 1240 if (run && shape_attr_p (run))
1149 { 1241 {
1150 PangoRectangle extents; 1242 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1243 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1251
1160 pango_layout_iter_free (iter); 1252 pango_layout_iter_free (iter);
1161} 1253}
1162 1254
1163int 1255int
1164has_wrapped (CFPlus::Layout self) 1256has_wrapped (DC::Layout self)
1165 CODE: 1257 CODE:
1166{ 1258{
1167 int lines = 1; 1259 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1260 const char *text = pango_layout_get_text (self->pl);
1169 1261
1174} 1266}
1175 OUTPUT: 1267 OUTPUT:
1176 RETVAL 1268 RETVAL
1177 1269
1178SV * 1270SV *
1179get_text (CFPlus::Layout self) 1271get_text (DC::Layout self)
1180 CODE: 1272 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1273 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1274 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1275 OUTPUT:
1184 RETVAL 1276 RETVAL
1185 1277
1186void 1278void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1279set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1280 CODE:
1189 self->r = r; 1281 self->r = r;
1190 self->g = g; 1282 self->g = g;
1191 self->b = b; 1283 self->b = b;
1192 self->a = a; 1284 self->a = a;
1193 1285
1194void 1286void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1287set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1288 CODE:
1197 if (self->font != font) 1289 if (self->font != font)
1198 { 1290 {
1199 self->font = font; 1291 self->font = font;
1200 layout_update_font (self); 1292 layout_update_font (self);
1201 } 1293 }
1202 1294
1203void 1295void
1204set_height (CFPlus::Layout self, int base_height) 1296set_height (DC::Layout self, int base_height)
1205 CODE: 1297 CODE:
1206 if (self->base_height != base_height) 1298 if (self->base_height != base_height)
1207 { 1299 {
1208 self->base_height = base_height; 1300 self->base_height = base_height;
1209 layout_update_font (self); 1301 layout_update_font (self);
1210 } 1302 }
1211 1303
1212void 1304void
1213set_width (CFPlus::Layout self, int max_width = -1) 1305set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1306 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1307 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1308
1217void 1309void
1218set_indent (CFPlus::Layout self, int indent) 1310set_indent (DC::Layout self, int indent)
1219 CODE: 1311 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1312 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1313
1222void 1314void
1223set_spacing (CFPlus::Layout self, int spacing) 1315set_spacing (DC::Layout self, int spacing)
1224 CODE: 1316 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1317 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1318
1227void 1319void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1320set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1321 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1322 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1323 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1324 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1325 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1326 : PANGO_ELLIPSIZE_NONE
1235 ); 1327 );
1236 1328
1237void 1329void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1330set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1331 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1332 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1333
1242void 1334void
1243size (CFPlus::Layout self) 1335size (DC::Layout self)
1244 PPCODE: 1336 PPCODE:
1245{ 1337{
1246 int w, h; 1338 int w, h;
1247 1339
1248 layout_get_pixel_size (self, &w, &h); 1340 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1343 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1344 PUSHs (sv_2mortal (newSViv (h)));
1253} 1345}
1254 1346
1255int 1347int
1256descent (CFPlus::Layout self) 1348descent (DC::Layout self)
1257 CODE: 1349 CODE:
1258{ 1350{
1259 PangoRectangle rect; 1351 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1352 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1353 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1354 RETVAL = PANGO_DESCENT (rect);
1263} 1355}
1264 OUTPUT: 1356 OUTPUT:
1265 RETVAL 1357 RETVAL
1266 1358
1267int 1359int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1360xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1361 CODE:
1270{ 1362{
1271 int index, trailing; 1363 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1364 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1365 RETVAL = index + trailing;
1274} 1366}
1275 OUTPUT: 1367 OUTPUT:
1276 RETVAL 1368 RETVAL
1277 1369
1278void 1370void
1279cursor_pos (CFPlus::Layout self, int index) 1371cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1372 PPCODE:
1281{ 1373{
1282 PangoRectangle strong_pos; 1374 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1375 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1376
1285 EXTEND (SP, 3); 1377 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1379 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1381}
1290 1382
1291void 1383void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1384index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1385 PPCODE:
1294{ 1386{
1295 int line, x; 1387 int line, x;
1296 1388
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1389 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1390#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1391 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1392 --line;
1393#endif
1300 EXTEND (SP, 2); 1394 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1395 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1396 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1397}
1304 1398
1305void 1399void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1400line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1401 PPCODE:
1308{ 1402{
1309 PangoLayoutLine *lp; 1403 PangoLayoutLine *lp;
1310 int index, trailing; 1404 int index, trailing;
1311 1405
1312 if (line < 0) 1406 if (line < 0)
1313 XSRETURN_EMPTY; 1407 XSRETURN_EMPTY;
1314 1408
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1409 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1410 XSRETURN_EMPTY; /* do better */
1317 1411
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1412 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1413
1320 EXTEND (SP, 2); 1414 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1420 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1421 }
1328} 1422}
1329 1423
1330void 1424void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1425render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1426 CODE:
1333 rc_clear (self->rc); 1427 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1428 pango_opengl_render_layout_subpixel (
1335 self->pl, 1429 self->pl,
1336 self->rc, 1430 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1435 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1436 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1437 pango_layout_context_changed (self->pl);
1344 1438
1345void 1439void
1346draw (CFPlus::Layout self) 1440draw (DC::Layout self)
1347 CODE: 1441 CODE:
1348{ 1442{
1349 glEnable (GL_TEXTURE_2D); 1443 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1444 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1445 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1453 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1454 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1455 glDisable (GL_TEXTURE_2D);
1362} 1456}
1363 1457
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1458MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1459
1366PROTOTYPES: ENABLE 1460PROTOTYPES: ENABLE
1367 1461
1368void 1462void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1463pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1542 RETVAL = width > 0;
1449} 1543}
1450 OUTPUT: 1544 OUTPUT:
1451 RETVAL 1545 RETVAL
1452 1546
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1547MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1548
1455PROTOTYPES: DISABLE 1549PROTOTYPES: DISABLE
1456 1550
1457CFPlus::Map 1551DC::Map
1458new (SV *class) 1552new (SV *class)
1459 CODE: 1553 CODE:
1460 New (0, RETVAL, 1, struct map); 1554 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1555 RETVAL->x = 0;
1462 RETVAL->y = 0; 1556 RETVAL->y = 0;
1470 RETVAL->row = 0; 1564 RETVAL->row = 0;
1471 OUTPUT: 1565 OUTPUT:
1472 RETVAL 1566 RETVAL
1473 1567
1474void 1568void
1475DESTROY (CFPlus::Map self) 1569DESTROY (DC::Map self)
1476 CODE: 1570 CODE:
1477{ 1571{
1478 map_clear (self); 1572 map_clear (self);
1479 Safefree (self->face2tile); 1573 Safefree (self->face2tile);
1480 Safefree (self->tex); 1574 Safefree (self->tex);
1481 Safefree (self); 1575 Safefree (self);
1482} 1576}
1483 1577
1484void 1578void
1485resize (CFPlus::Map self, int map_width, int map_height) 1579resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1580 CODE:
1487 self->w = map_width; 1581 self->w = map_width;
1488 self->h = map_height; 1582 self->h = map_height;
1489 1583
1490void 1584void
1491clear (CFPlus::Map self) 1585clear (DC::Map self)
1492 CODE: 1586 CODE:
1493 map_clear (self); 1587 map_clear (self);
1494 1588
1495void 1589void
1496set_tileid (CFPlus::Map self, int face, int tile) 1590set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1591 CODE:
1498{ 1592{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1593 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1594 need_texid (self, tile);
1501} 1595}
1502 1596
1503void 1597void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1598set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1599 CODE:
1506{ 1600{
1507 tileid texid; 1601 tileid texid;
1508 maptex *tex; 1602 maptex *tex;
1509 1603
1522 tex->smoothtile = self->face2tile [smooth]; 1616 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1617 tex->smoothlevel = level;
1524} 1618}
1525 1619
1526void 1620void
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) 1621set_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: 1622 CODE:
1529{ 1623{
1530 need_texid (self, texid); 1624 need_texid (self, texid);
1531 1625
1532 { 1626 {
1552 // from transparent color bleeding and ugly wrapping effects. 1646 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1648}
1555 1649
1556int 1650int
1557ox (CFPlus::Map self) 1651ox (DC::Map self)
1558 ALIAS: 1652 ALIAS:
1559 oy = 1 1653 oy = 1
1560 x = 2 1654 x = 2
1561 y = 3 1655 y = 3
1562 w = 4 1656 w = 4
1573 } 1667 }
1574 OUTPUT: 1668 OUTPUT:
1575 RETVAL 1669 RETVAL
1576 1670
1577void 1671void
1578scroll (CFPlus::Map self, int dx, int dy) 1672scroll (DC::Map self, int dx, int dy)
1579 CODE: 1673 CODE:
1580{ 1674{
1581 if (dx > 0) 1675 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1676 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1677 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1693 self->y += MAP_EXTEND_Y;
1600 } 1694 }
1601} 1695}
1602 1696
1603SV * 1697SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1698map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1699 CODE:
1606{ 1700{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1702 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1703 mapcell *cell;
1637 uint8_t ext, cmd; 1731 uint8_t ext, cmd;
1638 1732
1639 do 1733 do
1640 { 1734 {
1641 ext = *data++; 1735 ext = *data++;
1642 cmd = ext & 0x3f; 1736 cmd = ext & 0x7f;
1643 1737
1644 if (cmd < 4) 1738 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1739 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1740 else if (cmd == 5) // health
1647 { 1741 {
1650 } 1744 }
1651 else if (cmd == 6) // monster width 1745 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1746 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1747 else if (cmd == 0x47)
1654 { 1748 {
1655 if (*data == 4) 1749 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 1753
1658 data += *data + 1; 1754 data += *data + 1;
1659 } 1755 }
1660 else if (cmd == 8) // cell flags 1756 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1757 cell->flags = *data++;
1691 } 1787 }
1692 } 1788 }
1693 } 1789 }
1694 } 1790 }
1695 else 1791 else
1696 cell->darkness = 0; 1792 CELL_CLEAR (cell);
1697 } 1793 }
1698} 1794}
1699 OUTPUT: 1795 OUTPUT:
1700 RETVAL 1796 RETVAL
1701 1797
1702SV * 1798SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1799mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1800 CODE:
1705{ 1801{
1706 int x1, x; 1802 int x1, x;
1707 int y1, y; 1803 int y1, y;
1708 int z; 1804 int z;
1753} 1849}
1754 OUTPUT: 1850 OUTPUT:
1755 RETVAL 1851 RETVAL
1756 1852
1757void 1853void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 1855 CODE:
1760{ 1856{
1761 int x, y, z; 1857 int x, y, z;
1762 1858
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1860 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) 1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 1862 smooth_key skey;
1767 1863 int pl_x, pl_y;
1864 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1865 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1866 rc_key_t key;
1770 rc_array_t *arr; 1867 rc_array_t *arr;
1868
1869 pl_tex.name = 0;
1771 1870
1772 // thats current max. sorry. 1871 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1872 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1873 if (sh > 255) sh = 255;
1775 1874
1830 tileid tile = cell->tile [z]; 1929 tileid tile = cell->tile [z];
1831 1930
1832 if (tile) 1931 if (tile)
1833 { 1932 {
1834 maptex tex = self->tex [tile]; 1933 maptex tex = self->tex [tile];
1835 int px, py; 1934 int px = (x + 1) * T - tex.w;
1935 int py = (y + 1) * T - tex.h;
1836 1936
1837 if (key.texname != tex.name) 1937 if (key.texname != tex.name)
1838 { 1938 {
1839 if (!tex.name) 1939 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 1940 tex = self->tex [2]; /* missing, replace by noface */
1841 1941
1842 key.texname = tex.name; 1942 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 1943 arr = rc_array (rc, &key);
1844 } 1944 }
1845 1945
1846 px = (x + 1) * T - tex.w; 1946 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 1947 {
1948 pl_x = px;
1949 pl_y = py;
1950 pl_tex = tex;
1951 continue;
1952 }
1848 1953
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1955 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); 1956 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); 1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853 1958
1854 if (cell->flags && z == 2) 1959 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 1960 {
1856 // overlays such as the speech bubble, probably more to come 1961 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 1962 if (cell->flags & 1)
1858 { 1963 {
1859 maptex tex = self->tex [1]; 1964 maptex tex = self->tex [1];
1998 } 2103 }
1999 2104
2000 hv_clear (smooth); 2105 hv_clear (smooth);
2001 } 2106 }
2002 2107
2108 if (pl_tex.name)
2109 {
2110 maptex tex = pl_tex;
2111 int px = pl_x + sdx;
2112 int py = pl_y + sdy;
2113
2114 key.texname = tex.name;
2115 arr = rc_array (rc, &key);
2116
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2121
2122 rc_draw (rc);
2123 }
2124
2003 glDisable (GL_BLEND); 2125 glDisable (GL_BLEND);
2004 rc_free (rc); 2126 rc_free (rc);
2005 2127
2006 // top layer: overlays such as the health bar 2128 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2129 for (y = 0; y < sh; y++)
2034 } 2156 }
2035 } 2157 }
2036} 2158}
2037 2159
2038void 2160void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2162 CODE:
2041{ 2163{
2042 static float color[16][3] = { 2164 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2165 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2166 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2216 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2217 glDisable (GL_TEXTURE_2D);
2096} 2218}
2097 2219
2098void 2220void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2221fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2222 PPCODE:
2101{ 2223{
2102 int x, y; 2224 int x, y;
2103 int sw1 = sw + 2; 2225 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2226 int sh1 = sh + 2;
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2297 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2298 PUSHs (darkness3_sv);
2177} 2299}
2178 2300
2179SV * 2301SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2302get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2303 CODE:
2182{ 2304{
2183 int x, y, x1, y1; 2305 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2306 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2307 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2364 else
2243 *data++ = 0; 2365 *data++ = 0;
2244 } 2366 }
2245 } 2367 }
2246 2368
2369 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 {
2247 SvPOK_only (data_sv); 2372 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 }
2375
2249 RETVAL = data_sv; 2376 RETVAL = data_sv;
2250} 2377}
2251 OUTPUT: 2378 OUTPUT:
2252 RETVAL 2379 RETVAL
2253 2380
2254void 2381void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2382set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2383 PPCODE:
2257{ 2384{
2258 int x, y, z; 2385 int x, y, z;
2259 int w, h; 2386 int w, h;
2260 int x1, y1; 2387 int x1, y1;
2388 STRLEN len;
2389 uint8_t *data, *end;
2390
2391 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv);
2394 end = data + len + 8;
2395
2396 if (len < 5)
2397 XSRETURN_EMPTY;
2261 2398
2262 if (*data++ != 0) 2399 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2400 XSRETURN_EMPTY; /* version mismatch */
2264 2401
2265 w = *data++ << 8; w |= *data++; 2402 w = *data++ << 8; w |= *data++;
2280 { 2417 {
2281 maprow *row = map_get_row (self, y); 2418 maprow *row = map_get_row (self, y);
2282 2419
2283 for (x = x0; x < x1; x++) 2420 for (x = x0; x < x1; x++)
2284 { 2421 {
2422 uint8_t flags;
2423
2424 if (data + 7 >= end)
2425 XSRETURN_EMPTY;
2426
2285 uint8_t flags = *data++; 2427 flags = *data++;
2286 2428
2287 if (flags) 2429 if (flags)
2288 { 2430 {
2289 mapcell *cell = row_get_cell (row, x); 2431 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2432 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2435 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2436 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2437
2296 if (cell->darkness == 0) 2438 if (cell->darkness == 0)
2297 { 2439 {
2298 cell->darkness = 0; 2440 /*cell->darkness = 0;*/
2441 EXTEND (SP, 3);
2299 2442
2300 for (z = 0; z <= 2; z++) 2443 for (z = 0; z <= 2; z++)
2301 { 2444 {
2302 tileid t = tile [z]; 2445 tileid t = tile [z];
2303 2446
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2447 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2448 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2449 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2450 need_texid (self, t);
2308 } 2451 }
2309 2452
2310 cell->tile [z] = t; 2453 cell->tile [z] = t;
2311 } 2454 }
2313 } 2456 }
2314 } 2457 }
2315 } 2458 }
2316} 2459}
2317 2460
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2461MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2462
2320CFPlus::RW 2463DC::RW
2321new (SV *class, SV *data_sv) 2464new (SV *class, SV *data_sv)
2322 CODE: 2465 CODE:
2323{ 2466{
2324 STRLEN datalen; 2467 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2468 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2470 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2471}
2329 OUTPUT: 2472 OUTPUT:
2330 RETVAL 2473 RETVAL
2331 2474
2332CFPlus::RW 2475DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2476new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2477 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2478 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2479 OUTPUT:
2337 RETVAL 2480 RETVAL
2338 2481
2339# fails on win32: 2482# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2483# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2484#void
2342#close (CFPlus::RW self) 2485#close (DC::RW self)
2343# CODE: 2486# CODE:
2344# (self->(close)) (self); 2487# (self->(close)) (self);
2345 2488
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2489MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2490
2348PROTOTYPES: DISABLE 2491PROTOTYPES: DISABLE
2349 2492
2350CFPlus::Channel 2493DC::Channel
2351find () 2494find ()
2352 CODE: 2495 CODE:
2353{ 2496{
2354 RETVAL = Mix_GroupAvailable (-1); 2497 RETVAL = Mix_GroupAvailable (-1);
2355 2498
2368} 2511}
2369 OUTPUT: 2512 OUTPUT:
2370 RETVAL 2513 RETVAL
2371 2514
2372void 2515void
2373halt (CFPlus::Channel self) 2516halt (DC::Channel self)
2374 CODE: 2517 CODE:
2375 Mix_HaltChannel (self); 2518 Mix_HaltChannel (self);
2376 2519
2377void 2520void
2378expire (CFPlus::Channel self, int ticks = -1) 2521expire (DC::Channel self, int ticks = -1)
2379 CODE: 2522 CODE:
2380 Mix_ExpireChannel (self, ticks); 2523 Mix_ExpireChannel (self, ticks);
2381 2524
2382void 2525void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2526fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2527 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2528 Mix_FadeOutChannel (self, ticks);
2386 2529
2387int 2530int
2388volume (CFPlus::Channel self, int volume) 2531volume (DC::Channel self, int volume)
2389 CODE: 2532 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2533 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2534 OUTPUT:
2392 RETVAL 2535 RETVAL
2393 2536
2394void 2537void
2395unregister_all_effects (CFPlus::Channel self) 2538unregister_all_effects (DC::Channel self)
2396 CODE: 2539 CODE:
2397 Mix_UnregisterAllEffects (self); 2540 Mix_UnregisterAllEffects (self);
2398 2541
2399void 2542void
2400set_panning (CFPlus::Channel self, int left, int right) 2543set_panning (DC::Channel self, int left, int right)
2401 CODE: 2544 CODE:
2402 left = CLAMP (left , 0, 255); 2545 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2546 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2547 Mix_SetPanning (self, left, right);
2405 2548
2406void 2549void
2407set_distance (CFPlus::Channel self, int distance) 2550set_distance (DC::Channel self, int distance)
2408 CODE: 2551 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2552 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2553
2411void 2554void
2412set_position (CFPlus::Channel self, int angle, int distance) 2555set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2556 CODE:
2414 2557
2415void 2558void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2560 CODE:
2418{ 2561{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2562 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); 2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2565}
2423 2566
2424void 2567void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2568set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2569 CODE:
2427 Mix_SetReverseStereo (self, flip); 2570 Mix_SetReverseStereo (self, flip);
2428 2571
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2573
2431PROTOTYPES: DISABLE 2574PROTOTYPES: DISABLE
2432 2575
2433CFPlus::MixChunk 2576DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2577new (SV *class, DC::RW rwops)
2435 CODE: 2578 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2579 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2580 OUTPUT:
2438 RETVAL 2581 RETVAL
2439 2582
2440void 2583void
2441DESTROY (CFPlus::MixChunk self) 2584DESTROY (DC::MixChunk self)
2442 CODE: 2585 CODE:
2443 Mix_FreeChunk (self); 2586 Mix_FreeChunk (self);
2444 2587
2445int 2588int
2446volume (CFPlus::MixChunk self, int volume = -1) 2589volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2590 CODE:
2448 if (items > 1) 2591 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2592 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2593 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2594 OUTPUT:
2452 RETVAL 2595 RETVAL
2453 2596
2454CFPlus::Channel 2597DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2598play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2599 CODE:
2457{ 2600{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2601 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2602
2460 if (RETVAL < 0) 2603 if (RETVAL < 0)
2467 } 2610 }
2468} 2611}
2469 OUTPUT: 2612 OUTPUT:
2470 RETVAL 2613 RETVAL
2471 2614
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2616
2474int 2617int
2475volume (int volume = -1) 2618volume (int volume = -1)
2476 PROTOTYPE: ;$ 2619 PROTOTYPE: ;$
2477 CODE: 2620 CODE:
2489void 2632void
2490halt () 2633halt ()
2491 CODE: 2634 CODE:
2492 Mix_HaltMusic (); 2635 Mix_HaltMusic ();
2493 2636
2494CFPlus::MixMusic 2637DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2638new (SV *class, DC::RW rwops)
2496 CODE: 2639 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2640 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2641 OUTPUT:
2499 RETVAL 2642 RETVAL
2500 2643
2501void 2644void
2502DESTROY (CFPlus::MixMusic self) 2645DESTROY (DC::MixMusic self)
2503 CODE: 2646 CODE:
2504 Mix_FreeMusic (self); 2647 Mix_FreeMusic (self);
2505 2648
2506int 2649int
2507play (CFPlus::MixMusic self, int loops = -1) 2650play (DC::MixMusic self, int loops = -1)
2508 CODE: 2651 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2652 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2653 OUTPUT:
2511 RETVAL 2654 RETVAL
2512 2655
2513void 2656void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2657fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2658 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2659 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2660
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2661MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2662
2520PROTOTYPES: ENABLE 2663PROTOTYPES: ENABLE
2521 2664
2522BOOT: 2665BOOT:
2523{ 2666{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2667 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2668 static const struct {
2526 const char *name; 2669 const char *name;
2527 IV iv; 2670 IV iv;
2528 } *civ, const_iv[] = { 2671 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2672# 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) 2965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 2966 CODE:
2824 if (gl.SeparableFilter2D) 2967 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2969
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 2971
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 2973
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2974void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2975
2858 3001
2859void glEndList () 3002void glEndList ()
2860 3003
2861void glCallList (int list) 3004void glCallList (int list)
2862 3005
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3007
2865PROTOTYPES: DISABLE 3008PROTOTYPES: DISABLE
2866 3009
2867void 3010void
2868find_widget (SV *self, NV x, NV y) 3011find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3015 XPUSHs (self);
2873} 3016}
2874 3017
2875BOOT: 3018BOOT:
2876{ 3019{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3020 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3021
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3022 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); 3023 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); 3024 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); 3025 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3026}
2884 3027
2885void 3028void
2886draw (SV *self) 3029draw (SV *self)
2887 CODE: 3030 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3037 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3038 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3039 double draw_x, draw_y;
2897 3040
2898 if (!SvROK (self)) 3041 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3042 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3043
2901 hv = (HV *)SvRV (self); 3044 hv = (HV *)SvRV (self);
2902 3045
2903 if (SvTYPE (hv) != SVt_PVHV) 3046 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3047 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3048
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3049 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.; 3050 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3051
2909 if (!h || !w) 3052 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines