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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines