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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines