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.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 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),
677
678 const_iv (FOW_DARKNESS)
626# undef const_iv 679# undef const_iv
627 }; 680 };
628 681
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
648 701
649NV floor (NV x) 702NV floor (NV x)
650 703
651NV ceil (NV x) 704NV ceil (NV x)
652 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
653IV minpot (UV n) 712IV minpot (UV n)
654 713
655IV popcount (UV n) 714IV popcount (UV n)
656 715
657void 716void
659 CODE: 718 CODE:
660{ 719{
661 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 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); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif
664} 728}
665 729
666char *
667SDL_GetError () 730char *SDL_GetError ()
668 731
669int 732int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 733
672void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
673SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
674 748
675void 749void
676SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
677 PPCODE: 751 PPCODE:
678{ 752{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 767
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 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); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 770
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 772
702 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
703 while (*m) 774 while (*m)
704 { 775 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 777 {
707 AV *av = newAV (); 778 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
753 824
754int 825int
755SDL_GetAppState () 826SDL_GetAppState ()
756 827
828int
829SDL_GetModState ()
830
757void 831void
758poll_events () 832poll_events ()
759 PPCODE: 833 PPCODE:
760{ 834{
761 SDL_Event ev; 835 SDL_Event ev;
770 { 844 {
771 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
772 case SDL_KEYUP: 846 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 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 */ 850 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); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 852 break;
779 853
780 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 873 x = ev.motion.x;
800 y = ev.motion.y; 874 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 876 }
803 877
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 884 }
811 break; 885 break;
812 886
813 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 890
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 899 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 900 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 901 break;
828 } 902 }
829 903
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 905 }
832} 906}
833 907
834int 908int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 968 }
895 } 969 }
896#endif 970#endif
897} 971}
898 972
899void 973int
900add_font (char *file) 974add_font (char *file)
901 CODE: 975 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
903 979
904void 980void
905load_image_inline (SV *image_) 981load_image_inline (SV *image_)
906 ALIAS: 982 ALIAS:
907 load_image_file = 1 983 load_image_file = 1
993void 1069void
994error (char *message) 1070error (char *message)
995 CODE: 1071 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1072 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1073#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1075#endif
1000 1076
1001void 1077void
1002fatal (char *message) 1078fatal (char *message)
1003 CODE: 1079 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1080 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1081#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1082 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1083#endif
1008 _exit (1); 1084 _exit (1);
1009 1085
1010void 1086void
1011_exit (int retval = 0) 1087_exit (int retval = 0)
1023#if DEBUG 1099#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1100 VALGRIND_DO_LEAK_CHECK;
1025#endif 1101#endif
1026} 1102}
1027 1103
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1104MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1105
1030PROTOTYPES: DISABLE 1106PROTOTYPES: DISABLE
1031 1107
1032CFPlus::Font 1108DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1109new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1110 CODE:
1035{ 1111{
1036 int count; 1112 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1116}
1041 OUTPUT: 1117 OUTPUT:
1042 RETVAL 1118 RETVAL
1043 1119
1044void 1120void
1045DESTROY (CFPlus::Font self) 1121DESTROY (DC::Font self)
1046 CODE: 1122 CODE:
1047 pango_font_description_free (self); 1123 pango_font_description_free (self);
1048 1124
1049void 1125void
1050make_default (CFPlus::Font self) 1126make_default (DC::Font self)
1051 PROTOTYPE: $ 1127 PROTOTYPE: $
1052 CODE: 1128 CODE:
1053 default_font = self; 1129 default_font = self;
1054 1130
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1131MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1132
1057PROTOTYPES: DISABLE 1133PROTOTYPES: DISABLE
1058 1134
1059void 1135void
1060reset_glyph_cache () 1136glyph_cache_backup ()
1061 PROTOTYPE: 1137 PROTOTYPE:
1062 CODE: 1138 CODE:
1139 tc_backup ();
1140
1141void
1142glyph_cache_restore ()
1143 PROTOTYPE:
1144 CODE:
1063 tc_clear (); 1145 tc_restore ();
1064 1146
1065CFPlus::Layout 1147DC::Layout
1066new (SV *class) 1148new (SV *class)
1067 CODE: 1149 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1150 New (0, RETVAL, 1, struct cf_layout);
1069 1151
1070 RETVAL->pl = pango_layout_new (opengl_context); 1152 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1162 layout_update_font (RETVAL);
1081 OUTPUT: 1163 OUTPUT:
1082 RETVAL 1164 RETVAL
1083 1165
1084void 1166void
1085DESTROY (CFPlus::Layout self) 1167DESTROY (DC::Layout self)
1086 CODE: 1168 CODE:
1087 g_object_unref (self->pl); 1169 g_object_unref (self->pl);
1088 rc_free (self->rc); 1170 rc_free (self->rc);
1089 Safefree (self); 1171 Safefree (self);
1090 1172
1091void 1173void
1092set_text (CFPlus::Layout self, SV *text_) 1174set_text (DC::Layout self, SV *text_)
1093 CODE: 1175 CODE:
1094{ 1176{
1095 STRLEN textlen; 1177 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1097 1179
1098 pango_layout_set_text (self->pl, text, textlen); 1180 pango_layout_set_text (self->pl, text, textlen);
1099} 1181}
1100 1182
1101void 1183void
1102set_markup (CFPlus::Layout self, SV *text_) 1184set_markup (DC::Layout self, SV *text_)
1103 CODE: 1185 CODE:
1104{ 1186{
1105 STRLEN textlen; 1187 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1188 char *text = SvPVutf8 (text_, textlen);
1107 1189
1108 pango_layout_set_markup (self->pl, text, textlen); 1190 pango_layout_set_markup (self->pl, text, textlen);
1109} 1191}
1110 1192
1111void 1193void
1112set_shapes (CFPlus::Layout self, ...) 1194set_shapes (DC::Layout self, ...)
1113 CODE: 1195 CODE:
1114{ 1196{
1115 PangoAttrList *attrs = 0; 1197 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1198 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1199 const char *pos = text;
1152 if (attrs) 1234 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1235 pango_layout_set_attributes (self->pl, attrs);
1154} 1236}
1155 1237
1156void 1238void
1157get_shapes (CFPlus::Layout self) 1239get_shapes (DC::Layout self)
1158 PPCODE: 1240 PPCODE:
1159{ 1241{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1242 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1243
1162 do 1244 do
1163 { 1245 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1246 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1247
1166 if (run && shape_attr_p (run)) 1248 if (run && shape_attr_p (run))
1167 { 1249 {
1168 PangoRectangle extents; 1250 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1251 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1259
1178 pango_layout_iter_free (iter); 1260 pango_layout_iter_free (iter);
1179} 1261}
1180 1262
1181int 1263int
1182has_wrapped (CFPlus::Layout self) 1264has_wrapped (DC::Layout self)
1183 CODE: 1265 CODE:
1184{ 1266{
1185 int lines = 1; 1267 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1268 const char *text = pango_layout_get_text (self->pl);
1187 1269
1192} 1274}
1193 OUTPUT: 1275 OUTPUT:
1194 RETVAL 1276 RETVAL
1195 1277
1196SV * 1278SV *
1197get_text (CFPlus::Layout self) 1279get_text (DC::Layout self)
1198 CODE: 1280 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1281 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1282 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1283 OUTPUT:
1202 RETVAL 1284 RETVAL
1203 1285
1204void 1286void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1287set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1288 CODE:
1207 self->r = r; 1289 self->r = r;
1208 self->g = g; 1290 self->g = g;
1209 self->b = b; 1291 self->b = b;
1210 self->a = a; 1292 self->a = a;
1211 1293
1212void 1294void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1295set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1296 CODE:
1215 if (self->font != font) 1297 if (self->font != font)
1216 { 1298 {
1217 self->font = font; 1299 self->font = font;
1218 layout_update_font (self); 1300 layout_update_font (self);
1219 } 1301 }
1220 1302
1221void 1303void
1222set_height (CFPlus::Layout self, int base_height) 1304set_height (DC::Layout self, int base_height)
1223 CODE: 1305 CODE:
1224 if (self->base_height != base_height) 1306 if (self->base_height != base_height)
1225 { 1307 {
1226 self->base_height = base_height; 1308 self->base_height = base_height;
1227 layout_update_font (self); 1309 layout_update_font (self);
1228 } 1310 }
1229 1311
1230void 1312void
1231set_width (CFPlus::Layout self, int max_width = -1) 1313set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1314 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1315 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1316
1235void 1317void
1236set_indent (CFPlus::Layout self, int indent) 1318set_indent (DC::Layout self, int indent)
1237 CODE: 1319 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1320 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1321
1240void 1322void
1241set_spacing (CFPlus::Layout self, int spacing) 1323set_spacing (DC::Layout self, int spacing)
1242 CODE: 1324 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1325 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1326
1245void 1327void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1328set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1329 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1330 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1331 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1332 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1333 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1334 : PANGO_ELLIPSIZE_NONE
1253 ); 1335 );
1254 1336
1255void 1337void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1338set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1339 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1340 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1341
1260void 1342void
1261size (CFPlus::Layout self) 1343size (DC::Layout self)
1262 PPCODE: 1344 PPCODE:
1263{ 1345{
1264 int w, h; 1346 int w, h;
1265 1347
1266 layout_get_pixel_size (self, &w, &h); 1348 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1351 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1352 PUSHs (sv_2mortal (newSViv (h)));
1271} 1353}
1272 1354
1273int 1355int
1274descent (CFPlus::Layout self) 1356descent (DC::Layout self)
1275 CODE: 1357 CODE:
1276{ 1358{
1277 PangoRectangle rect; 1359 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1360 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1361 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1362 RETVAL = PANGO_DESCENT (rect);
1281} 1363}
1282 OUTPUT: 1364 OUTPUT:
1283 RETVAL 1365 RETVAL
1284 1366
1285int 1367int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1368xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1369 CODE:
1288{ 1370{
1289 int index, trailing; 1371 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1372 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1373 RETVAL = index + trailing;
1292} 1374}
1293 OUTPUT: 1375 OUTPUT:
1294 RETVAL 1376 RETVAL
1295 1377
1296void 1378void
1297cursor_pos (CFPlus::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1380 PPCODE:
1299{ 1381{
1300 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1384
1303 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1389}
1308 1390
1309void 1391void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1393 PPCODE:
1312{ 1394{
1313 int line, x; 1395 int line, x;
1314 1396
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1400 --line;
1401#endif
1318 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1403 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1404 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1405}
1322 1406
1323void 1407void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1408line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1409 PPCODE:
1326{ 1410{
1327 PangoLayoutLine *lp; 1411 PangoLayoutLine *lp;
1328 int index, trailing; 1412 int index, trailing;
1329 1413
1330 if (line < 0) 1414 if (line < 0)
1331 XSRETURN_EMPTY; 1415 XSRETURN_EMPTY;
1332 1416
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1417 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1418 XSRETURN_EMPTY; /* do better */
1335 1419
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1420 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1421
1338 EXTEND (SP, 2); 1422 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1428 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1429 }
1346} 1430}
1347 1431
1348void 1432void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1433render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1434 CODE:
1351 rc_clear (self->rc); 1435 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1436 pango_opengl_render_layout_subpixel (
1353 self->pl, 1437 self->pl,
1354 self->rc, 1438 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1443 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1444 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1445 pango_layout_context_changed (self->pl);
1362 1446
1363void 1447void
1364draw (CFPlus::Layout self) 1448draw (DC::Layout self)
1365 CODE: 1449 CODE:
1366{ 1450{
1367 glEnable (GL_TEXTURE_2D); 1451 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1452 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1453 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1461 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1462 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1463 glDisable (GL_TEXTURE_2D);
1380} 1464}
1381 1465
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1466MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1467
1384PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1385 1469
1386void 1470void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1471pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1550 RETVAL = width > 0;
1467} 1551}
1468 OUTPUT: 1552 OUTPUT:
1469 RETVAL 1553 RETVAL
1470 1554
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1555MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1556
1473PROTOTYPES: DISABLE 1557PROTOTYPES: DISABLE
1474 1558
1475CFPlus::Map 1559DC::Map
1476new (SV *class) 1560new (SV *class)
1477 CODE: 1561 CODE:
1478 New (0, RETVAL, 1, struct map); 1562 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1563 RETVAL->x = 0;
1480 RETVAL->y = 0; 1564 RETVAL->y = 0;
1488 RETVAL->row = 0; 1572 RETVAL->row = 0;
1489 OUTPUT: 1573 OUTPUT:
1490 RETVAL 1574 RETVAL
1491 1575
1492void 1576void
1493DESTROY (CFPlus::Map self) 1577DESTROY (DC::Map self)
1494 CODE: 1578 CODE:
1495{ 1579{
1496 map_clear (self); 1580 map_clear (self);
1497 Safefree (self->face2tile); 1581 Safefree (self->face2tile);
1498 Safefree (self->tex); 1582 Safefree (self->tex);
1499 Safefree (self); 1583 Safefree (self);
1500} 1584}
1501 1585
1502void 1586void
1503resize (CFPlus::Map self, int map_width, int map_height) 1587resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1588 CODE:
1505 self->w = map_width; 1589 self->w = map_width;
1506 self->h = map_height; 1590 self->h = map_height;
1507 1591
1508void 1592void
1509clear (CFPlus::Map self) 1593clear (DC::Map self)
1510 CODE: 1594 CODE:
1511 map_clear (self); 1595 map_clear (self);
1512 1596
1513void 1597void
1514set_tileid (CFPlus::Map self, int face, int tile) 1598set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1599 CODE:
1516{ 1600{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1601 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1602 need_texid (self, tile);
1519} 1603}
1520 1604
1521void 1605void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1606set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1607 CODE:
1524{ 1608{
1525 tileid texid; 1609 tileid texid;
1526 maptex *tex; 1610 maptex *tex;
1527 1611
1540 tex->smoothtile = self->face2tile [smooth]; 1624 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1625 tex->smoothlevel = level;
1542} 1626}
1543 1627
1544void 1628void
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) 1629set_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: 1630 CODE:
1547{ 1631{
1548 need_texid (self, texid); 1632 need_texid (self, texid);
1549 1633
1550 { 1634 {
1570 // from transparent color bleeding and ugly wrapping effects. 1654 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1656}
1573 1657
1574int 1658int
1575ox (CFPlus::Map self) 1659ox (DC::Map self)
1576 ALIAS: 1660 ALIAS:
1577 oy = 1 1661 oy = 1
1578 x = 2 1662 x = 2
1579 y = 3 1663 y = 3
1580 w = 4 1664 w = 4
1591 } 1675 }
1592 OUTPUT: 1676 OUTPUT:
1593 RETVAL 1677 RETVAL
1594 1678
1595void 1679void
1596scroll (CFPlus::Map self, int dx, int dy) 1680scroll (DC::Map self, int dx, int dy)
1597 CODE: 1681 CODE:
1598{ 1682{
1599 if (dx > 0) 1683 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1684 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1685 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1701 self->y += MAP_EXTEND_Y;
1618 } 1702 }
1619} 1703}
1620 1704
1621SV * 1705SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1706map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1707 CODE:
1624{ 1708{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1710 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1711 mapcell *cell;
1655 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1656 1740
1657 do 1741 do
1658 { 1742 {
1659 ext = *data++; 1743 ext = *data++;
1660 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1661 1745
1662 if (cmd < 4) 1746 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1665 { 1749 {
1668 } 1752 }
1669 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1672 { 1756 {
1673 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1761
1676 data += *data + 1; 1762 data += *data + 1;
1677 } 1763 }
1678 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1765 cell->flags = *data++;
1709 } 1795 }
1710 } 1796 }
1711 } 1797 }
1712 } 1798 }
1713 else 1799 else
1714 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1715 } 1801 }
1716} 1802}
1717 OUTPUT: 1803 OUTPUT:
1718 RETVAL 1804 RETVAL
1719 1805
1720SV * 1806SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1807mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1808 CODE:
1723{ 1809{
1724 int x1, x; 1810 int x1, x;
1725 int y1, y; 1811 int y1, y;
1726 int z; 1812 int z;
1771} 1857}
1772 OUTPUT: 1858 OUTPUT:
1773 RETVAL 1859 RETVAL
1774 1860
1775void 1861void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 1863 CODE:
1778{ 1864{
1779 int x, y, z; 1865 int x, y, z;
1780 1866
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 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) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 1870 smooth_key skey;
1785 1871 int pl_x, pl_y;
1872 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1873 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1874 rc_key_t key;
1788 rc_array_t *arr; 1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1789 1878
1790 // thats current max. sorry. 1879 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1793 1882
1848 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1849 1938
1850 if (tile) 1939 if (tile)
1851 { 1940 {
1852 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1853 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1854 1944
1855 if (key.texname != tex.name) 1945 if (key.texname != tex.name)
1856 { 1946 {
1857 if (!tex.name) 1947 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1859 1949
1860 key.texname = tex.name; 1950 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 1951 arr = rc_array (rc, &key);
1862 } 1952 }
1863 1953
1864 px = (x + 1) * T - tex.w; 1954 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1866 1961
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1963 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); 1964 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); 1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 1966
1872 if (cell->flags && z == 2) 1967 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 1968 {
1874 // overlays such as the speech bubble, probably more to come 1969 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 1970 if (cell->flags & 1)
1876 { 1971 {
1877 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
2016 } 2111 }
2017 2112
2018 hv_clear (smooth); 2113 hv_clear (smooth);
2019 } 2114 }
2020 2115
2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
2121
2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
2021 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2022 rc_free (rc); 2134 rc_free (rc);
2023 2135
2024 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
2052 } 2164 }
2053 } 2165 }
2054} 2166}
2055 2167
2056void 2168void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2170 CODE:
2059{ 2171{
2060 static float color[16][3] = { 2172 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2173 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2174 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2224 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2225 glDisable (GL_TEXTURE_2D);
2114} 2226}
2115 2227
2116void 2228void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2229fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2230 PPCODE:
2119{ 2231{
2120 int x, y; 2232 int x, y;
2121 int sw1 = sw + 2; 2233 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2234 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2243
2132 mx += self->x - 1; 2244 mx += self->x - 1;
2133 my += self->y - 1; 2245 my += self->y - 1;
2134 2246
2135 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2248
2137 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2139 { 2251 {
2140 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2305 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2306 PUSHs (darkness3_sv);
2195} 2307}
2196 2308
2197SV * 2309SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2310get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2311 CODE:
2200{ 2312{
2201 int x, y, x1, y1; 2313 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2314 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2315 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2372 else
2261 *data++ = 0; 2373 *data++ = 0;
2262 } 2374 }
2263 } 2375 }
2264 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2265 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2267 RETVAL = data_sv; 2384 RETVAL = data_sv;
2268} 2385}
2269 OUTPUT: 2386 OUTPUT:
2270 RETVAL 2387 RETVAL
2271 2388
2272void 2389void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2391 PPCODE:
2275{ 2392{
2276 int x, y, z; 2393 int x, y, z;
2277 int w, h; 2394 int w, h;
2278 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2279 2406
2280 if (*data++ != 0) 2407 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2282 2409
2283 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
2298 { 2425 {
2299 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2300 2427
2301 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2302 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2303 uint8_t flags = *data++; 2435 flags = *data++;
2304 2436
2305 if (flags) 2437 if (flags)
2306 { 2438 {
2307 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2445
2314 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2315 { 2447 {
2316 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2317 2450
2318 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2319 { 2452 {
2320 tileid t = tile [z]; 2453 tileid t = tile [z];
2321 2454
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2456 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2458 need_texid (self, t);
2326 } 2459 }
2327 2460
2328 cell->tile [z] = t; 2461 cell->tile [z] = t;
2329 } 2462 }
2331 } 2464 }
2332 } 2465 }
2333 } 2466 }
2334} 2467}
2335 2468
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2469MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2470
2338CFPlus::RW 2471DC::RW
2339new (SV *class, SV *data_sv) 2472new (SV *class, SV *data_sv)
2340 CODE: 2473 CODE:
2341{ 2474{
2342 STRLEN datalen; 2475 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2476 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2478 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2479}
2347 OUTPUT: 2480 OUTPUT:
2348 RETVAL 2481 RETVAL
2349 2482
2350CFPlus::RW 2483DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2484new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2485 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2486 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2487 OUTPUT:
2355 RETVAL 2488 RETVAL
2356 2489
2357# fails on win32: 2490# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2491# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2492#void
2360#close (CFPlus::RW self) 2493#close (DC::RW self)
2361# CODE: 2494# CODE:
2362# (self->(close)) (self); 2495# (self->(close)) (self);
2363 2496
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2497MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2498
2366PROTOTYPES: DISABLE 2499PROTOTYPES: DISABLE
2367 2500
2368CFPlus::Channel 2501DC::Channel
2369find () 2502find ()
2370 CODE: 2503 CODE:
2371{ 2504{
2372 RETVAL = Mix_GroupAvailable (-1); 2505 RETVAL = Mix_GroupAvailable (-1);
2373 2506
2386} 2519}
2387 OUTPUT: 2520 OUTPUT:
2388 RETVAL 2521 RETVAL
2389 2522
2390void 2523void
2391halt (CFPlus::Channel self) 2524halt (DC::Channel self)
2392 CODE: 2525 CODE:
2393 Mix_HaltChannel (self); 2526 Mix_HaltChannel (self);
2394 2527
2395void 2528void
2396expire (CFPlus::Channel self, int ticks = -1) 2529expire (DC::Channel self, int ticks = -1)
2397 CODE: 2530 CODE:
2398 Mix_ExpireChannel (self, ticks); 2531 Mix_ExpireChannel (self, ticks);
2399 2532
2400void 2533void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2534fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2535 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2536 Mix_FadeOutChannel (self, ticks);
2404 2537
2405int 2538int
2406volume (CFPlus::Channel self, int volume) 2539volume (DC::Channel self, int volume)
2407 CODE: 2540 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2541 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2542 OUTPUT:
2410 RETVAL 2543 RETVAL
2411 2544
2412void 2545void
2413unregister_all_effects (CFPlus::Channel self) 2546unregister_all_effects (DC::Channel self)
2414 CODE: 2547 CODE:
2415 Mix_UnregisterAllEffects (self); 2548 Mix_UnregisterAllEffects (self);
2416 2549
2417void 2550void
2418set_panning (CFPlus::Channel self, int left, int right) 2551set_panning (DC::Channel self, int left, int right)
2419 CODE: 2552 CODE:
2420 left = CLAMP (left , 0, 255); 2553 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2554 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2555 Mix_SetPanning (self, left, right);
2423 2556
2424void 2557void
2425set_distance (CFPlus::Channel self, int distance) 2558set_distance (DC::Channel self, int distance)
2426 CODE: 2559 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2560 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2561
2429void 2562void
2430set_position (CFPlus::Channel self, int angle, int distance) 2563set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2564 CODE:
2432 2565
2433void 2566void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2568 CODE:
2436{ 2569{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2570 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); 2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2573}
2441 2574
2442void 2575void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2576set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2577 CODE:
2445 Mix_SetReverseStereo (self, flip); 2578 Mix_SetReverseStereo (self, flip);
2446 2579
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2581
2449PROTOTYPES: DISABLE 2582PROTOTYPES: DISABLE
2450 2583
2451CFPlus::MixChunk 2584DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2585new (SV *class, DC::RW rwops)
2453 CODE: 2586 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2587 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2588 OUTPUT:
2456 RETVAL 2589 RETVAL
2457 2590
2458void 2591void
2459DESTROY (CFPlus::MixChunk self) 2592DESTROY (DC::MixChunk self)
2460 CODE: 2593 CODE:
2461 Mix_FreeChunk (self); 2594 Mix_FreeChunk (self);
2462 2595
2463int 2596int
2464volume (CFPlus::MixChunk self, int volume = -1) 2597volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2598 CODE:
2466 if (items > 1) 2599 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2600 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2601 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2602 OUTPUT:
2470 RETVAL 2603 RETVAL
2471 2604
2472CFPlus::Channel 2605DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2606play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2607 CODE:
2475{ 2608{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2609 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2610
2478 if (RETVAL < 0) 2611 if (RETVAL < 0)
2485 } 2618 }
2486} 2619}
2487 OUTPUT: 2620 OUTPUT:
2488 RETVAL 2621 RETVAL
2489 2622
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2624
2492int 2625int
2493volume (int volume = -1) 2626volume (int volume = -1)
2494 PROTOTYPE: ;$ 2627 PROTOTYPE: ;$
2495 CODE: 2628 CODE:
2507void 2640void
2508halt () 2641halt ()
2509 CODE: 2642 CODE:
2510 Mix_HaltMusic (); 2643 Mix_HaltMusic ();
2511 2644
2512CFPlus::MixMusic 2645DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2646new (SV *class, DC::RW rwops)
2514 CODE: 2647 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2648 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2649 OUTPUT:
2517 RETVAL 2650 RETVAL
2518 2651
2519void 2652void
2520DESTROY (CFPlus::MixMusic self) 2653DESTROY (DC::MixMusic self)
2521 CODE: 2654 CODE:
2522 Mix_FreeMusic (self); 2655 Mix_FreeMusic (self);
2523 2656
2524int 2657int
2525play (CFPlus::MixMusic self, int loops = -1) 2658play (DC::MixMusic self, int loops = -1)
2526 CODE: 2659 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2660 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2661 OUTPUT:
2529 RETVAL 2662 RETVAL
2530 2663
2531void 2664void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2665fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2666 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2667 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2668
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2669MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2670
2538PROTOTYPES: ENABLE 2671PROTOTYPES: ENABLE
2539 2672
2540BOOT: 2673BOOT:
2541{ 2674{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2675 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2676 static const struct {
2544 const char *name; 2677 const char *name;
2545 IV iv; 2678 IV iv;
2546 } *civ, const_iv[] = { 2679 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2680# 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) 2973void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 2974 CODE:
2842 if (gl.SeparableFilter2D) 2975 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2976 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 2977
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2978void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 2979
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2980void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 2981
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 2982void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 2983
2876 3009
2877void glEndList () 3010void glEndList ()
2878 3011
2879void glCallList (int list) 3012void glCallList (int list)
2880 3013
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3015
2883PROTOTYPES: DISABLE 3016PROTOTYPES: DISABLE
2884 3017
2885void 3018void
2886find_widget (SV *self, NV x, NV y) 3019find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3023 XPUSHs (self);
2891} 3024}
2892 3025
2893BOOT: 3026BOOT:
2894{ 3027{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3028 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3029
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3030 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); 3031 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); 3032 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); 3033 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3034}
2902 3035
2903void 3036void
2904draw (SV *self) 3037draw (SV *self)
2905 CODE: 3038 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3045 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3046 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3047 double draw_x, draw_y;
2915 3048
2916 if (!SvROK (self)) 3049 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3050 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3051
2919 hv = (HV *)SvRV (self); 3052 hv = (HV *)SvRV (self);
2920 3053
2921 if (SvTYPE (hv) != SVt_PVHV) 3054 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3055 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3056
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3057 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.; 3058 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3059
2927 if (!h || !w) 3060 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines