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.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
120 137
121#include "pango-font.c" 138#include "pango-font.c"
122#include "pango-fontmap.c" 139#include "pango-fontmap.c"
123#include "pango-render.c" 140#include "pango-render.c"
124 141
125typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
129 146
130typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
131 148
132static int 149static int
133shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
134{ 151{
135 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
149 166
150typedef struct cf_layout { 167typedef struct cf_layout {
151 PangoLayout *pl; 168 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
153 int base_height; 170 int base_height;
154 CFPlus__Font font; 171 DC__Font font;
155 rc_t *rc; 172 rc_t *rc;
156} *CFPlus__Layout; 173} *DC__Layout;
157 174
158static CFPlus__Font default_font; 175static DC__Font default_font;
159static PangoContext *opengl_context; 176static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
161 178
162static void 179static void
163substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
168#endif 185#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 187}
171 188
172static void 189static void
173layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 199
183 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
184} 201}
185 202
186static void 203static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 205{
189 PangoRectangle rect; 206 PangoRectangle rect;
190 207
191 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
233 250
234 int32_t rows; 251 int32_t rows;
235 maprow *row; 252 maprow *row;
236} *CFPlus__Map; 253} *DC__Map;
237 254
238static char * 255static char *
239prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
240{ 257{
241 char *p; 258 char *p;
279 self->texs *= 2; 296 self->texs *= 2;
280 } 297 }
281} 298}
282 299
283static maprow * 300static maprow *
284map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
285{ 302{
286 if (0 > y) 303 if (0 > y)
287 { 304 {
288 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
327 344
328 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
329} 346}
330 347
331static mapcell * 348static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
333{ 350{
334 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
335} 352}
336 353
337static void 354static void
338map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
339{ 356{
340 int r; 357 int r;
341 358
342 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
360 mapcell *cell; 387 mapcell *cell;
361 388
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
498 return 0; 522 return 0;
499 523
500 return 1; 524 return 1;
501} 525}
502 526
503MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
504 528
505PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
506 530
507BOOT: 531BOOT:
508{ 532{
509 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 534 static const struct {
511 const char *name; 535 const char *name;
512 IV iv; 536 IV iv;
513 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
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),
624 648
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 677# undef const_iv
627 }; 678 };
628 679
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 710 CODE:
660{ 711{
661 opengl_fontmap = pango_opengl_font_map_new (); 712 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 713 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 714 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
715 /*pango_context_set_font_description (opengl_context, default_font);*/
716#if PANGO_VERSION_CHECK (1, 15, 2)
717 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
718 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
719#endif
664} 720}
665 721
666char *
667SDL_GetError () 722char *SDL_GetError ()
668 723
669int 724int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 725
672void 726int SDL_InitSubSystem (U32 flags)
727
728void SDL_QuitSubSystem (U32 flags)
729
673SDL_Quit () 730void SDL_Quit ()
731
732int SDL_GL_SetAttribute (int attr, int value)
733
734int SDL_GL_GetAttribute (int attr)
735 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL))
737 XSRETURN_UNDEF;
738 OUTPUT:
739 RETVAL
674 740
675void 741void
676SDL_ListModes (int rgb, int alpha) 742SDL_ListModes (int rgb, int alpha)
677 PPCODE: 743 PPCODE:
678{ 744{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 757 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 759
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 760 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 761 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 762
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 763 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 764
702 if (m && m != (SDL_Rect **)-1) 765 if (m && m != (SDL_Rect **)-1)
703 while (*m) 766 while (*m)
704 { 767 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 768 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 769 {
707 AV *av = newAV (); 770 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 771 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 772 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 773 av_push (av, newSViv (rgb));
734 797
735 if (RETVAL) 798 if (RETVAL)
736 { 799 {
737 av_clear (texture_av); 800 av_clear (texture_av);
738 801
739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 804#include "glfunc.h"
742#undef GL_FUNC 805#undef GL_FUNC
743 } 806 }
744} 807}
751char * 814char *
752SDL_GetKeyName (int sym) 815SDL_GetKeyName (int sym)
753 816
754int 817int
755SDL_GetAppState () 818SDL_GetAppState ()
819
820int
821SDL_GetModState ()
756 822
757void 823void
758poll_events () 824poll_events ()
759 PPCODE: 825 PPCODE:
760{ 826{
770 { 836 {
771 case SDL_KEYDOWN: 837 case SDL_KEYDOWN:
772 case SDL_KEYUP: 838 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 841 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 842 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 844 break;
779 845
780 case SDL_ACTIVEEVENT: 846 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 865 x = ev.motion.x;
800 y = ev.motion.y; 866 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 868 }
803 869
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 871 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 872 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 873 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 874 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 875 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 876 }
811 break; 877 break;
812 878
813 case SDL_MOUSEBUTTONDOWN: 879 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 880 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 881 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 882
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 883 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 884 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 885 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 886 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 891 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 892 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 893 break;
828 } 894 }
829 895
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 897 }
832} 898}
833 899
834int 900int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 960 }
895 } 961 }
896#endif 962#endif
897} 963}
898 964
899void 965int
900add_font (char *file) 966add_font (char *file)
901 CODE: 967 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT:
970 RETVAL
903 971
904void 972void
905load_image_inline (SV *image_) 973load_image_inline (SV *image_)
906 ALIAS: 974 ALIAS:
907 load_image_file = 1 975 load_image_file = 1
993void 1061void
994error (char *message) 1062error (char *message)
995 CODE: 1063 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1064 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1065#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1066 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1067#endif
1000 1068
1001void 1069void
1002fatal (char *message) 1070fatal (char *message)
1003 CODE: 1071 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1072 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1073#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1075#endif
1008 _exit (1); 1076 _exit (1);
1009 1077
1010void 1078void
1011_exit (int retval = 0) 1079_exit (int retval = 0)
1023#if DEBUG 1091#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1092 VALGRIND_DO_LEAK_CHECK;
1025#endif 1093#endif
1026} 1094}
1027 1095
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1096MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1097
1030PROTOTYPES: DISABLE 1098PROTOTYPES: DISABLE
1031 1099
1032CFPlus::Font 1100DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1101new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1102 CODE:
1035{ 1103{
1036 int count; 1104 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1108}
1041 OUTPUT: 1109 OUTPUT:
1042 RETVAL 1110 RETVAL
1043 1111
1044void 1112void
1045DESTROY (CFPlus::Font self) 1113DESTROY (DC::Font self)
1046 CODE: 1114 CODE:
1047 pango_font_description_free (self); 1115 pango_font_description_free (self);
1048 1116
1049void 1117void
1050make_default (CFPlus::Font self) 1118make_default (DC::Font self)
1051 PROTOTYPE: $ 1119 PROTOTYPE: $
1052 CODE: 1120 CODE:
1053 default_font = self; 1121 default_font = self;
1054 1122
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1123MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1124
1057PROTOTYPES: DISABLE 1125PROTOTYPES: DISABLE
1058 1126
1059void 1127void
1060reset_glyph_cache () 1128glyph_cache_backup ()
1061 PROTOTYPE: 1129 PROTOTYPE:
1062 CODE: 1130 CODE:
1131 tc_backup ();
1132
1133void
1134glyph_cache_restore ()
1135 PROTOTYPE:
1136 CODE:
1063 tc_clear (); 1137 tc_restore ();
1064 1138
1065CFPlus::Layout 1139DC::Layout
1066new (SV *class) 1140new (SV *class)
1067 CODE: 1141 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1142 New (0, RETVAL, 1, struct cf_layout);
1069 1143
1070 RETVAL->pl = pango_layout_new (opengl_context); 1144 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1154 layout_update_font (RETVAL);
1081 OUTPUT: 1155 OUTPUT:
1082 RETVAL 1156 RETVAL
1083 1157
1084void 1158void
1085DESTROY (CFPlus::Layout self) 1159DESTROY (DC::Layout self)
1086 CODE: 1160 CODE:
1087 g_object_unref (self->pl); 1161 g_object_unref (self->pl);
1088 rc_free (self->rc); 1162 rc_free (self->rc);
1089 Safefree (self); 1163 Safefree (self);
1090 1164
1091void 1165void
1092set_text (CFPlus::Layout self, SV *text_) 1166set_text (DC::Layout self, SV *text_)
1093 CODE: 1167 CODE:
1094{ 1168{
1095 STRLEN textlen; 1169 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1097 1171
1098 pango_layout_set_text (self->pl, text, textlen); 1172 pango_layout_set_text (self->pl, text, textlen);
1099} 1173}
1100 1174
1101void 1175void
1102set_markup (CFPlus::Layout self, SV *text_) 1176set_markup (DC::Layout self, SV *text_)
1103 CODE: 1177 CODE:
1104{ 1178{
1105 STRLEN textlen; 1179 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1180 char *text = SvPVutf8 (text_, textlen);
1107 1181
1108 pango_layout_set_markup (self->pl, text, textlen); 1182 pango_layout_set_markup (self->pl, text, textlen);
1109} 1183}
1110 1184
1111void 1185void
1112set_shapes (CFPlus::Layout self, ...) 1186set_shapes (DC::Layout self, ...)
1113 CODE: 1187 CODE:
1114{ 1188{
1115 PangoAttrList *attrs = 0; 1189 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1190 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1191 const char *pos = text;
1152 if (attrs) 1226 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1227 pango_layout_set_attributes (self->pl, attrs);
1154} 1228}
1155 1229
1156void 1230void
1157get_shapes (CFPlus::Layout self) 1231get_shapes (DC::Layout self)
1158 PPCODE: 1232 PPCODE:
1159{ 1233{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1234 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1235
1162 do 1236 do
1163 { 1237 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1238 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1239
1166 if (run && shape_attr_p (run)) 1240 if (run && shape_attr_p (run))
1167 { 1241 {
1168 PangoRectangle extents; 1242 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1243 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1251
1178 pango_layout_iter_free (iter); 1252 pango_layout_iter_free (iter);
1179} 1253}
1180 1254
1181int 1255int
1182has_wrapped (CFPlus::Layout self) 1256has_wrapped (DC::Layout self)
1183 CODE: 1257 CODE:
1184{ 1258{
1185 int lines = 1; 1259 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1260 const char *text = pango_layout_get_text (self->pl);
1187 1261
1192} 1266}
1193 OUTPUT: 1267 OUTPUT:
1194 RETVAL 1268 RETVAL
1195 1269
1196SV * 1270SV *
1197get_text (CFPlus::Layout self) 1271get_text (DC::Layout self)
1198 CODE: 1272 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1273 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1274 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1275 OUTPUT:
1202 RETVAL 1276 RETVAL
1203 1277
1204void 1278void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1279set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1280 CODE:
1207 self->r = r; 1281 self->r = r;
1208 self->g = g; 1282 self->g = g;
1209 self->b = b; 1283 self->b = b;
1210 self->a = a; 1284 self->a = a;
1211 1285
1212void 1286void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1287set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1288 CODE:
1215 if (self->font != font) 1289 if (self->font != font)
1216 { 1290 {
1217 self->font = font; 1291 self->font = font;
1218 layout_update_font (self); 1292 layout_update_font (self);
1219 } 1293 }
1220 1294
1221void 1295void
1222set_height (CFPlus::Layout self, int base_height) 1296set_height (DC::Layout self, int base_height)
1223 CODE: 1297 CODE:
1224 if (self->base_height != base_height) 1298 if (self->base_height != base_height)
1225 { 1299 {
1226 self->base_height = base_height; 1300 self->base_height = base_height;
1227 layout_update_font (self); 1301 layout_update_font (self);
1228 } 1302 }
1229 1303
1230void 1304void
1231set_width (CFPlus::Layout self, int max_width = -1) 1305set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1306 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1307 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1308
1235void 1309void
1236set_indent (CFPlus::Layout self, int indent) 1310set_indent (DC::Layout self, int indent)
1237 CODE: 1311 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1312 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1313
1240void 1314void
1241set_spacing (CFPlus::Layout self, int spacing) 1315set_spacing (DC::Layout self, int spacing)
1242 CODE: 1316 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1317 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1318
1245void 1319void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1320set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1321 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1322 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1323 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1324 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1325 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1326 : PANGO_ELLIPSIZE_NONE
1253 ); 1327 );
1254 1328
1255void 1329void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1330set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1331 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1332 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1333
1260void 1334void
1261size (CFPlus::Layout self) 1335size (DC::Layout self)
1262 PPCODE: 1336 PPCODE:
1263{ 1337{
1264 int w, h; 1338 int w, h;
1265 1339
1266 layout_get_pixel_size (self, &w, &h); 1340 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1343 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1344 PUSHs (sv_2mortal (newSViv (h)));
1271} 1345}
1272 1346
1273int 1347int
1274descent (CFPlus::Layout self) 1348descent (DC::Layout self)
1275 CODE: 1349 CODE:
1276{ 1350{
1277 PangoRectangle rect; 1351 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1352 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1353 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1354 RETVAL = PANGO_DESCENT (rect);
1281} 1355}
1282 OUTPUT: 1356 OUTPUT:
1283 RETVAL 1357 RETVAL
1284 1358
1285int 1359int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1360xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1361 CODE:
1288{ 1362{
1289 int index, trailing; 1363 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1364 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1365 RETVAL = index + trailing;
1292} 1366}
1293 OUTPUT: 1367 OUTPUT:
1294 RETVAL 1368 RETVAL
1295 1369
1296void 1370void
1297cursor_pos (CFPlus::Layout self, int index) 1371cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1372 PPCODE:
1299{ 1373{
1300 PangoRectangle strong_pos; 1374 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1375 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1376
1303 EXTEND (SP, 3); 1377 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1379 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1381}
1308 1382
1309void 1383void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1384index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1385 PPCODE:
1312{ 1386{
1313 int line, x; 1387 int line, x;
1314 1388
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1389 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1390#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1391 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1392 --line;
1393#endif
1318 EXTEND (SP, 2); 1394 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1395 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1396 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1397}
1322 1398
1323void 1399void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1400line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1401 PPCODE:
1326{ 1402{
1327 PangoLayoutLine *lp; 1403 PangoLayoutLine *lp;
1328 int index, trailing; 1404 int index, trailing;
1329 1405
1330 if (line < 0) 1406 if (line < 0)
1331 XSRETURN_EMPTY; 1407 XSRETURN_EMPTY;
1332 1408
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1409 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1410 XSRETURN_EMPTY; /* do better */
1335 1411
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1412 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1413
1338 EXTEND (SP, 2); 1414 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1420 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1421 }
1346} 1422}
1347 1423
1348void 1424void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1425render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1426 CODE:
1351 rc_clear (self->rc); 1427 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1428 pango_opengl_render_layout_subpixel (
1353 self->pl, 1429 self->pl,
1354 self->rc, 1430 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1435 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1436 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1437 pango_layout_context_changed (self->pl);
1362 1438
1363void 1439void
1364draw (CFPlus::Layout self) 1440draw (DC::Layout self)
1365 CODE: 1441 CODE:
1366{ 1442{
1367 glEnable (GL_TEXTURE_2D); 1443 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1444 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1445 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1453 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1454 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1455 glDisable (GL_TEXTURE_2D);
1380} 1456}
1381 1457
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1458MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1459
1384PROTOTYPES: ENABLE 1460PROTOTYPES: ENABLE
1385 1461
1386void 1462void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1463pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1542 RETVAL = width > 0;
1467} 1543}
1468 OUTPUT: 1544 OUTPUT:
1469 RETVAL 1545 RETVAL
1470 1546
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1547MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1548
1473PROTOTYPES: DISABLE 1549PROTOTYPES: DISABLE
1474 1550
1475CFPlus::Map 1551DC::Map
1476new (SV *class) 1552new (SV *class)
1477 CODE: 1553 CODE:
1478 New (0, RETVAL, 1, struct map); 1554 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1555 RETVAL->x = 0;
1480 RETVAL->y = 0; 1556 RETVAL->y = 0;
1488 RETVAL->row = 0; 1564 RETVAL->row = 0;
1489 OUTPUT: 1565 OUTPUT:
1490 RETVAL 1566 RETVAL
1491 1567
1492void 1568void
1493DESTROY (CFPlus::Map self) 1569DESTROY (DC::Map self)
1494 CODE: 1570 CODE:
1495{ 1571{
1496 map_clear (self); 1572 map_clear (self);
1497 Safefree (self->face2tile); 1573 Safefree (self->face2tile);
1498 Safefree (self->tex); 1574 Safefree (self->tex);
1499 Safefree (self); 1575 Safefree (self);
1500} 1576}
1501 1577
1502void 1578void
1503resize (CFPlus::Map self, int map_width, int map_height) 1579resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1580 CODE:
1505 self->w = map_width; 1581 self->w = map_width;
1506 self->h = map_height; 1582 self->h = map_height;
1507 1583
1508void 1584void
1509clear (CFPlus::Map self) 1585clear (DC::Map self)
1510 CODE: 1586 CODE:
1511 map_clear (self); 1587 map_clear (self);
1512 1588
1513void 1589void
1514set_tileid (CFPlus::Map self, int face, int tile) 1590set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1591 CODE:
1516{ 1592{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1593 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1594 need_texid (self, tile);
1519} 1595}
1520 1596
1521void 1597void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1598set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1599 CODE:
1524{ 1600{
1525 tileid texid; 1601 tileid texid;
1526 maptex *tex; 1602 maptex *tex;
1527 1603
1540 tex->smoothtile = self->face2tile [smooth]; 1616 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1617 tex->smoothlevel = level;
1542} 1618}
1543 1619
1544void 1620void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1621set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1622 CODE:
1547{ 1623{
1548 need_texid (self, texid); 1624 need_texid (self, texid);
1549 1625
1550 { 1626 {
1570 // from transparent color bleeding and ugly wrapping effects. 1646 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1648}
1573 1649
1574int 1650int
1575ox (CFPlus::Map self) 1651ox (DC::Map self)
1576 ALIAS: 1652 ALIAS:
1577 oy = 1 1653 oy = 1
1578 x = 2 1654 x = 2
1579 y = 3 1655 y = 3
1580 w = 4 1656 w = 4
1591 } 1667 }
1592 OUTPUT: 1668 OUTPUT:
1593 RETVAL 1669 RETVAL
1594 1670
1595void 1671void
1596scroll (CFPlus::Map self, int dx, int dy) 1672scroll (DC::Map self, int dx, int dy)
1597 CODE: 1673 CODE:
1598{ 1674{
1599 if (dx > 0) 1675 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1676 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1677 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1693 self->y += MAP_EXTEND_Y;
1618 } 1694 }
1619} 1695}
1620 1696
1621SV * 1697SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1698map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1699 CODE:
1624{ 1700{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1702 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1703 mapcell *cell;
1655 uint8_t ext, cmd; 1731 uint8_t ext, cmd;
1656 1732
1657 do 1733 do
1658 { 1734 {
1659 ext = *data++; 1735 ext = *data++;
1660 cmd = ext & 0x3f; 1736 cmd = ext & 0x7f;
1661 1737
1662 if (cmd < 4) 1738 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1739 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1740 else if (cmd == 5) // health
1665 { 1741 {
1668 } 1744 }
1669 else if (cmd == 6) // monster width 1745 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1746 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1747 else if (cmd == 0x47)
1672 { 1748 {
1673 if (*data == 4) 1749 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1753
1676 data += *data + 1; 1754 data += *data + 1;
1677 } 1755 }
1678 else if (cmd == 8) // cell flags 1756 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1757 cell->flags = *data++;
1709 } 1787 }
1710 } 1788 }
1711 } 1789 }
1712 } 1790 }
1713 else 1791 else
1714 cell->darkness = 0; 1792 CELL_CLEAR (cell);
1715 } 1793 }
1716} 1794}
1717 OUTPUT: 1795 OUTPUT:
1718 RETVAL 1796 RETVAL
1719 1797
1720SV * 1798SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1799mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1800 CODE:
1723{ 1801{
1724 int x1, x; 1802 int x1, x;
1725 int y1, y; 1803 int y1, y;
1726 int z; 1804 int z;
1771} 1849}
1772 OUTPUT: 1850 OUTPUT:
1773 RETVAL 1851 RETVAL
1774 1852
1775void 1853void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 1855 CODE:
1778{ 1856{
1779 int x, y, z; 1857 int x, y, z;
1780 1858
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 1862 smooth_key skey;
1785 1863 int pl_x, pl_y;
1864 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1865 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1866 rc_key_t key;
1788 rc_array_t *arr; 1867 rc_array_t *arr;
1868
1869 pl_tex.name = 0;
1789 1870
1790 // thats current max. sorry. 1871 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1872 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1873 if (sh > 255) sh = 255;
1793 1874
1848 tileid tile = cell->tile [z]; 1929 tileid tile = cell->tile [z];
1849 1930
1850 if (tile) 1931 if (tile)
1851 { 1932 {
1852 maptex tex = self->tex [tile]; 1933 maptex tex = self->tex [tile];
1853 int px, py; 1934 int px = (x + 1) * T - tex.w;
1935 int py = (y + 1) * T - tex.h;
1854 1936
1855 if (key.texname != tex.name) 1937 if (key.texname != tex.name)
1856 { 1938 {
1857 if (!tex.name) 1939 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 1940 tex = self->tex [2]; /* missing, replace by noface */
1859 1941
1860 key.texname = tex.name; 1942 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 1943 arr = rc_array (rc, &key);
1862 } 1944 }
1863 1945
1864 px = (x + 1) * T - tex.w; 1946 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 1947 {
1948 pl_x = px;
1949 pl_y = py;
1950 pl_tex = tex;
1951 continue;
1952 }
1866 1953
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 1958
1872 if (cell->flags && z == 2) 1959 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 1960 {
1874 // overlays such as the speech bubble, probably more to come 1961 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 1962 if (cell->flags & 1)
1876 { 1963 {
1877 maptex tex = self->tex [1]; 1964 maptex tex = self->tex [1];
2016 } 2103 }
2017 2104
2018 hv_clear (smooth); 2105 hv_clear (smooth);
2019 } 2106 }
2020 2107
2108 if (pl_tex.name)
2109 {
2110 maptex tex = pl_tex;
2111 int px = pl_x + sdx;
2112 int py = pl_y + sdy;
2113
2114 key.texname = tex.name;
2115 arr = rc_array (rc, &key);
2116
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2121
2122 rc_draw (rc);
2123 }
2124
2021 glDisable (GL_BLEND); 2125 glDisable (GL_BLEND);
2022 rc_free (rc); 2126 rc_free (rc);
2023 2127
2024 // top layer: overlays such as the health bar 2128 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2129 for (y = 0; y < sh; y++)
2052 } 2156 }
2053 } 2157 }
2054} 2158}
2055 2159
2056void 2160void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2162 CODE:
2059{ 2163{
2060 static float color[16][3] = { 2164 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2165 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2166 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2216 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2217 glDisable (GL_TEXTURE_2D);
2114} 2218}
2115 2219
2116void 2220void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2221fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2222 PPCODE:
2119{ 2223{
2120 int x, y; 2224 int x, y;
2121 int sw1 = sw + 2; 2225 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2226 int sh1 = sh + 2;
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2297 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2298 PUSHs (darkness3_sv);
2195} 2299}
2196 2300
2197SV * 2301SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2302get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2303 CODE:
2200{ 2304{
2201 int x, y, x1, y1; 2305 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2306 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2307 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2364 else
2261 *data++ = 0; 2365 *data++ = 0;
2262 } 2366 }
2263 } 2367 }
2264 2368
2369 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 {
2265 SvPOK_only (data_sv); 2372 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 }
2375
2267 RETVAL = data_sv; 2376 RETVAL = data_sv;
2268} 2377}
2269 OUTPUT: 2378 OUTPUT:
2270 RETVAL 2379 RETVAL
2271 2380
2272void 2381void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2382set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2383 PPCODE:
2275{ 2384{
2276 int x, y, z; 2385 int x, y, z;
2277 int w, h; 2386 int w, h;
2278 int x1, y1; 2387 int x1, y1;
2388 STRLEN len;
2389 uint8_t *data, *end;
2390
2391 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv);
2394 end = data + len + 8;
2395
2396 if (len < 5)
2397 XSRETURN_EMPTY;
2279 2398
2280 if (*data++ != 0) 2399 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2400 XSRETURN_EMPTY; /* version mismatch */
2282 2401
2283 w = *data++ << 8; w |= *data++; 2402 w = *data++ << 8; w |= *data++;
2298 { 2417 {
2299 maprow *row = map_get_row (self, y); 2418 maprow *row = map_get_row (self, y);
2300 2419
2301 for (x = x0; x < x1; x++) 2420 for (x = x0; x < x1; x++)
2302 { 2421 {
2422 uint8_t flags;
2423
2424 if (data + 7 >= end)
2425 XSRETURN_EMPTY;
2426
2303 uint8_t flags = *data++; 2427 flags = *data++;
2304 2428
2305 if (flags) 2429 if (flags)
2306 { 2430 {
2307 mapcell *cell = row_get_cell (row, x); 2431 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2432 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2435 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2436 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2437
2314 if (cell->darkness == 0) 2438 if (cell->darkness == 0)
2315 { 2439 {
2316 cell->darkness = 0; 2440 /*cell->darkness = 0;*/
2441 EXTEND (SP, 3);
2317 2442
2318 for (z = 0; z <= 2; z++) 2443 for (z = 0; z <= 2; z++)
2319 { 2444 {
2320 tileid t = tile [z]; 2445 tileid t = tile [z];
2321 2446
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2447 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2448 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2449 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2450 need_texid (self, t);
2326 } 2451 }
2327 2452
2328 cell->tile [z] = t; 2453 cell->tile [z] = t;
2329 } 2454 }
2331 } 2456 }
2332 } 2457 }
2333 } 2458 }
2334} 2459}
2335 2460
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2461MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2462
2338CFPlus::RW 2463DC::RW
2339new (SV *class, SV *data_sv) 2464new (SV *class, SV *data_sv)
2340 CODE: 2465 CODE:
2341{ 2466{
2342 STRLEN datalen; 2467 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2468 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2470 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2471}
2347 OUTPUT: 2472 OUTPUT:
2348 RETVAL 2473 RETVAL
2349 2474
2350CFPlus::RW 2475DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2476new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2477 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2478 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2479 OUTPUT:
2355 RETVAL 2480 RETVAL
2356 2481
2357# fails on win32: 2482# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2483# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2484#void
2360#close (CFPlus::RW self) 2485#close (DC::RW self)
2361# CODE: 2486# CODE:
2362# (self->(close)) (self); 2487# (self->(close)) (self);
2363 2488
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2489MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2490
2366PROTOTYPES: DISABLE 2491PROTOTYPES: DISABLE
2367 2492
2368CFPlus::Channel 2493DC::Channel
2369find () 2494find ()
2370 CODE: 2495 CODE:
2371{ 2496{
2372 RETVAL = Mix_GroupAvailable (-1); 2497 RETVAL = Mix_GroupAvailable (-1);
2373 2498
2386} 2511}
2387 OUTPUT: 2512 OUTPUT:
2388 RETVAL 2513 RETVAL
2389 2514
2390void 2515void
2391halt (CFPlus::Channel self) 2516halt (DC::Channel self)
2392 CODE: 2517 CODE:
2393 Mix_HaltChannel (self); 2518 Mix_HaltChannel (self);
2394 2519
2395void 2520void
2396expire (CFPlus::Channel self, int ticks = -1) 2521expire (DC::Channel self, int ticks = -1)
2397 CODE: 2522 CODE:
2398 Mix_ExpireChannel (self, ticks); 2523 Mix_ExpireChannel (self, ticks);
2399 2524
2400void 2525void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2526fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2527 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2528 Mix_FadeOutChannel (self, ticks);
2404 2529
2405int 2530int
2406volume (CFPlus::Channel self, int volume) 2531volume (DC::Channel self, int volume)
2407 CODE: 2532 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2533 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2534 OUTPUT:
2410 RETVAL 2535 RETVAL
2411 2536
2412void 2537void
2413unregister_all_effects (CFPlus::Channel self) 2538unregister_all_effects (DC::Channel self)
2414 CODE: 2539 CODE:
2415 Mix_UnregisterAllEffects (self); 2540 Mix_UnregisterAllEffects (self);
2416 2541
2417void 2542void
2418set_panning (CFPlus::Channel self, int left, int right) 2543set_panning (DC::Channel self, int left, int right)
2419 CODE: 2544 CODE:
2420 left = CLAMP (left , 0, 255); 2545 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2546 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2547 Mix_SetPanning (self, left, right);
2423 2548
2424void 2549void
2425set_distance (CFPlus::Channel self, int distance) 2550set_distance (DC::Channel self, int distance)
2426 CODE: 2551 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2552 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2553
2429void 2554void
2430set_position (CFPlus::Channel self, int angle, int distance) 2555set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2556 CODE:
2432 2557
2433void 2558void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2560 CODE:
2436{ 2561{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2562 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2565}
2441 2566
2442void 2567void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2568set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2569 CODE:
2445 Mix_SetReverseStereo (self, flip); 2570 Mix_SetReverseStereo (self, flip);
2446 2571
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2573
2449PROTOTYPES: DISABLE 2574PROTOTYPES: DISABLE
2450 2575
2451CFPlus::MixChunk 2576DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2577new (SV *class, DC::RW rwops)
2453 CODE: 2578 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2579 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2580 OUTPUT:
2456 RETVAL 2581 RETVAL
2457 2582
2458void 2583void
2459DESTROY (CFPlus::MixChunk self) 2584DESTROY (DC::MixChunk self)
2460 CODE: 2585 CODE:
2461 Mix_FreeChunk (self); 2586 Mix_FreeChunk (self);
2462 2587
2463int 2588int
2464volume (CFPlus::MixChunk self, int volume = -1) 2589volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2590 CODE:
2466 if (items > 1) 2591 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2592 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2593 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2594 OUTPUT:
2470 RETVAL 2595 RETVAL
2471 2596
2472CFPlus::Channel 2597DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2598play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2599 CODE:
2475{ 2600{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2601 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2602
2478 if (RETVAL < 0) 2603 if (RETVAL < 0)
2485 } 2610 }
2486} 2611}
2487 OUTPUT: 2612 OUTPUT:
2488 RETVAL 2613 RETVAL
2489 2614
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2616
2492int 2617int
2493volume (int volume = -1) 2618volume (int volume = -1)
2494 PROTOTYPE: ;$ 2619 PROTOTYPE: ;$
2495 CODE: 2620 CODE:
2507void 2632void
2508halt () 2633halt ()
2509 CODE: 2634 CODE:
2510 Mix_HaltMusic (); 2635 Mix_HaltMusic ();
2511 2636
2512CFPlus::MixMusic 2637DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2638new (SV *class, DC::RW rwops)
2514 CODE: 2639 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2640 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2641 OUTPUT:
2517 RETVAL 2642 RETVAL
2518 2643
2519void 2644void
2520DESTROY (CFPlus::MixMusic self) 2645DESTROY (DC::MixMusic self)
2521 CODE: 2646 CODE:
2522 Mix_FreeMusic (self); 2647 Mix_FreeMusic (self);
2523 2648
2524int 2649int
2525play (CFPlus::MixMusic self, int loops = -1) 2650play (DC::MixMusic self, int loops = -1)
2526 CODE: 2651 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2652 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2653 OUTPUT:
2529 RETVAL 2654 RETVAL
2530 2655
2531void 2656void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2657fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2658 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2659 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2660
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2661MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2662
2538PROTOTYPES: ENABLE 2663PROTOTYPES: ENABLE
2539 2664
2540BOOT: 2665BOOT:
2541{ 2666{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2667 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2668 static const struct {
2544 const char *name; 2669 const char *name;
2545 IV iv; 2670 IV iv;
2546 } *civ, const_iv[] = { 2671 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2672# define const_iv(name) { # name, (IV)name }
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 2966 CODE:
2842 if (gl.SeparableFilter2D) 2967 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 2969
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 2971
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 2973
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 2974void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 2975
2876 3001
2877void glEndList () 3002void glEndList ()
2878 3003
2879void glCallList (int list) 3004void glCallList (int list)
2880 3005
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3007
2883PROTOTYPES: DISABLE 3008PROTOTYPES: DISABLE
2884 3009
2885void 3010void
2886find_widget (SV *self, NV x, NV y) 3011find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3015 XPUSHs (self);
2891} 3016}
2892 3017
2893BOOT: 3018BOOT:
2894{ 3019{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3020 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3021
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3022 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3023 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3024 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3025 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3026}
2902 3027
2903void 3028void
2904draw (SV *self) 3029draw (SV *self)
2905 CODE: 3030 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3037 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3038 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3039 double draw_x, draw_y;
2915 3040
2916 if (!SvROK (self)) 3041 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3042 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3043
2919 hv = (HV *)SvRV (self); 3044 hv = (HV *)SvRV (self);
2920 3045
2921 if (SvTYPE (hv) != SVt_PVHV) 3046 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3047 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3048
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3049 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3050 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3051
2927 if (!h || !w) 3052 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines