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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines