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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
120 137
121#include "pango-font.c" 138#include "pango-font.c"
122#include "pango-fontmap.c" 139#include "pango-fontmap.c"
123#include "pango-render.c" 140#include "pango-render.c"
124 141
125typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
129 146
130typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
131 148
132static int 149static int
133shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
134{ 151{
135 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
149 166
150typedef struct cf_layout { 167typedef struct cf_layout {
151 PangoLayout *pl; 168 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
153 int base_height; 170 int base_height;
154 CFPlus__Font font; 171 DC__Font font;
155 rc_t *rc; 172 rc_t *rc;
156} *CFPlus__Layout; 173} *DC__Layout;
157 174
158static CFPlus__Font default_font; 175static DC__Font default_font;
159static PangoContext *opengl_context; 176static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
161 178
162static void 179static void
163substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
168#endif 185#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 187}
171 188
172static void 189static void
173layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 199
183 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
184} 201}
185 202
186static void 203static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 205{
189 PangoRectangle rect; 206 PangoRectangle rect;
190 207
191 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
233 250
234 int32_t rows; 251 int32_t rows;
235 maprow *row; 252 maprow *row;
236} *CFPlus__Map; 253} *DC__Map;
237 254
238static char * 255static char *
239prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
240{ 257{
241 char *p; 258 char *p;
279 self->texs *= 2; 296 self->texs *= 2;
280 } 297 }
281} 298}
282 299
283static maprow * 300static maprow *
284map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
285{ 302{
286 if (0 > y) 303 if (0 > y)
287 { 304 {
288 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
327 344
328 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
329} 346}
330 347
331static mapcell * 348static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
333{ 350{
334 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
335} 352}
336 353
337static void 354static void
338map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
339{ 356{
340 int r; 357 int r;
341 358
342 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
360 mapcell *cell; 387 mapcell *cell;
361 388
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
498 return 0; 522 return 0;
499 523
500 return 1; 524 return 1;
501} 525}
502 526
503MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
504 528
505PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
506 530
507BOOT: 531BOOT:
508{ 532{
509 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 534 static const struct {
511 const char *name; 535 const char *name;
512 IV iv; 536 IV iv;
513 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
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 >= 800 && (*m)->h >= 600) 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));
752SDL_GetKeyName (int sym) 817SDL_GetKeyName (int sym)
753 818
754int 819int
755SDL_GetAppState () 820SDL_GetAppState ()
756 821
822int
823SDL_GetModState ()
824
757void 825void
758poll_events () 826poll_events ()
759 PPCODE: 827 PPCODE:
760{ 828{
761 SDL_Event ev; 829 SDL_Event ev;
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
1060glyph_cache_backup () 1130glyph_cache_backup ()
1066glyph_cache_restore () 1136glyph_cache_restore ()
1067 PROTOTYPE: 1137 PROTOTYPE:
1068 CODE: 1138 CODE:
1069 tc_restore (); 1139 tc_restore ();
1070 1140
1071CFPlus::Layout 1141DC::Layout
1072new (SV *class) 1142new (SV *class)
1073 CODE: 1143 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1144 New (0, RETVAL, 1, struct cf_layout);
1075 1145
1076 RETVAL->pl = pango_layout_new (opengl_context); 1146 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1156 layout_update_font (RETVAL);
1087 OUTPUT: 1157 OUTPUT:
1088 RETVAL 1158 RETVAL
1089 1159
1090void 1160void
1091DESTROY (CFPlus::Layout self) 1161DESTROY (DC::Layout self)
1092 CODE: 1162 CODE:
1093 g_object_unref (self->pl); 1163 g_object_unref (self->pl);
1094 rc_free (self->rc); 1164 rc_free (self->rc);
1095 Safefree (self); 1165 Safefree (self);
1096 1166
1097void 1167void
1098set_text (CFPlus::Layout self, SV *text_) 1168set_text (DC::Layout self, SV *text_)
1099 CODE: 1169 CODE:
1100{ 1170{
1101 STRLEN textlen; 1171 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1172 char *text = SvPVutf8 (text_, textlen);
1103 1173
1104 pango_layout_set_text (self->pl, text, textlen); 1174 pango_layout_set_text (self->pl, text, textlen);
1105} 1175}
1106 1176
1107void 1177void
1108set_markup (CFPlus::Layout self, SV *text_) 1178set_markup (DC::Layout self, SV *text_)
1109 CODE: 1179 CODE:
1110{ 1180{
1111 STRLEN textlen; 1181 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1182 char *text = SvPVutf8 (text_, textlen);
1113 1183
1114 pango_layout_set_markup (self->pl, text, textlen); 1184 pango_layout_set_markup (self->pl, text, textlen);
1115} 1185}
1116 1186
1117void 1187void
1118set_shapes (CFPlus::Layout self, ...) 1188set_shapes (DC::Layout self, ...)
1119 CODE: 1189 CODE:
1120{ 1190{
1121 PangoAttrList *attrs = 0; 1191 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1193 const char *pos = text;
1158 if (attrs) 1228 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1229 pango_layout_set_attributes (self->pl, attrs);
1160} 1230}
1161 1231
1162void 1232void
1163get_shapes (CFPlus::Layout self) 1233get_shapes (DC::Layout self)
1164 PPCODE: 1234 PPCODE:
1165{ 1235{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1236 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1237
1168 do 1238 do
1169 { 1239 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1240 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1241
1172 if (run && shape_attr_p (run)) 1242 if (run && shape_attr_p (run))
1173 { 1243 {
1174 PangoRectangle extents; 1244 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1245 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1253
1184 pango_layout_iter_free (iter); 1254 pango_layout_iter_free (iter);
1185} 1255}
1186 1256
1187int 1257int
1188has_wrapped (CFPlus::Layout self) 1258has_wrapped (DC::Layout self)
1189 CODE: 1259 CODE:
1190{ 1260{
1191 int lines = 1; 1261 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1262 const char *text = pango_layout_get_text (self->pl);
1193 1263
1198} 1268}
1199 OUTPUT: 1269 OUTPUT:
1200 RETVAL 1270 RETVAL
1201 1271
1202SV * 1272SV *
1203get_text (CFPlus::Layout self) 1273get_text (DC::Layout self)
1204 CODE: 1274 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1275 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1276 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1277 OUTPUT:
1208 RETVAL 1278 RETVAL
1209 1279
1210void 1280void
1211set_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.)
1212 CODE: 1282 CODE:
1213 self->r = r; 1283 self->r = r;
1214 self->g = g; 1284 self->g = g;
1215 self->b = b; 1285 self->b = b;
1216 self->a = a; 1286 self->a = a;
1217 1287
1218void 1288void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1289set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1290 CODE:
1221 if (self->font != font) 1291 if (self->font != font)
1222 { 1292 {
1223 self->font = font; 1293 self->font = font;
1224 layout_update_font (self); 1294 layout_update_font (self);
1225 } 1295 }
1226 1296
1227void 1297void
1228set_height (CFPlus::Layout self, int base_height) 1298set_height (DC::Layout self, int base_height)
1229 CODE: 1299 CODE:
1230 if (self->base_height != base_height) 1300 if (self->base_height != base_height)
1231 { 1301 {
1232 self->base_height = base_height; 1302 self->base_height = base_height;
1233 layout_update_font (self); 1303 layout_update_font (self);
1234 } 1304 }
1235 1305
1236void 1306void
1237set_width (CFPlus::Layout self, int max_width = -1) 1307set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1308 CODE:
1239 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);
1240 1310
1241void 1311void
1242set_indent (CFPlus::Layout self, int indent) 1312set_indent (DC::Layout self, int indent)
1243 CODE: 1313 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1314 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1315
1246void 1316void
1247set_spacing (CFPlus::Layout self, int spacing) 1317set_spacing (DC::Layout self, int spacing)
1248 CODE: 1318 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1319 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1320
1251void 1321void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1322set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1323 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1324 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1325 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1326 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1327 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1328 : PANGO_ELLIPSIZE_NONE
1259 ); 1329 );
1260 1330
1261void 1331void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1332set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1333 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1334 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1335
1266void 1336void
1267size (CFPlus::Layout self) 1337size (DC::Layout self)
1268 PPCODE: 1338 PPCODE:
1269{ 1339{
1270 int w, h; 1340 int w, h;
1271 1341
1272 layout_get_pixel_size (self, &w, &h); 1342 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1345 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1346 PUSHs (sv_2mortal (newSViv (h)));
1277} 1347}
1278 1348
1279int 1349int
1280descent (CFPlus::Layout self) 1350descent (DC::Layout self)
1281 CODE: 1351 CODE:
1282{ 1352{
1283 PangoRectangle rect; 1353 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1354 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1355 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1356 RETVAL = PANGO_DESCENT (rect);
1287} 1357}
1288 OUTPUT: 1358 OUTPUT:
1289 RETVAL 1359 RETVAL
1290 1360
1291int 1361int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1362xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1363 CODE:
1294{ 1364{
1295 int index, trailing; 1365 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1367 RETVAL = index + trailing;
1298} 1368}
1299 OUTPUT: 1369 OUTPUT:
1300 RETVAL 1370 RETVAL
1301 1371
1302void 1372void
1303cursor_pos (CFPlus::Layout self, int index) 1373cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1374 PPCODE:
1305{ 1375{
1306 PangoRectangle strong_pos; 1376 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1377 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1378
1309 EXTEND (SP, 3); 1379 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1381 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1382 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1383}
1314 1384
1315void 1385void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1386index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1387 PPCODE:
1318{ 1388{
1319 int line, x; 1389 int line, x;
1320 1390
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1393 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1394 --line;
1395#endif
1324 EXTEND (SP, 2); 1396 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1397 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1398 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1399}
1328 1400
1329void 1401void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1402line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1403 PPCODE:
1332{ 1404{
1333 PangoLayoutLine *lp; 1405 PangoLayoutLine *lp;
1334 int index, trailing; 1406 int index, trailing;
1335 1407
1336 if (line < 0) 1408 if (line < 0)
1337 XSRETURN_EMPTY; 1409 XSRETURN_EMPTY;
1338 1410
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1411 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1412 XSRETURN_EMPTY; /* do better */
1341 1413
1342 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);
1343 1415
1344 EXTEND (SP, 2); 1416 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1422 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1423 }
1352} 1424}
1353 1425
1354void 1426void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1427render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1428 CODE:
1357 rc_clear (self->rc); 1429 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1430 pango_opengl_render_layout_subpixel (
1359 self->pl, 1431 self->pl,
1360 self->rc, 1432 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1437 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1438 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1439 pango_layout_context_changed (self->pl);
1368 1440
1369void 1441void
1370draw (CFPlus::Layout self) 1442draw (DC::Layout self)
1371 CODE: 1443 CODE:
1372{ 1444{
1373 glEnable (GL_TEXTURE_2D); 1445 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1446 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1447 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1455 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1456 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1457 glDisable (GL_TEXTURE_2D);
1386} 1458}
1387 1459
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1460MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1461
1390PROTOTYPES: ENABLE 1462PROTOTYPES: ENABLE
1391 1463
1392void 1464void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1465pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1544 RETVAL = width > 0;
1473} 1545}
1474 OUTPUT: 1546 OUTPUT:
1475 RETVAL 1547 RETVAL
1476 1548
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1549MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1550
1479PROTOTYPES: DISABLE 1551PROTOTYPES: DISABLE
1480 1552
1481CFPlus::Map 1553DC::Map
1482new (SV *class) 1554new (SV *class)
1483 CODE: 1555 CODE:
1484 New (0, RETVAL, 1, struct map); 1556 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1557 RETVAL->x = 0;
1486 RETVAL->y = 0; 1558 RETVAL->y = 0;
1494 RETVAL->row = 0; 1566 RETVAL->row = 0;
1495 OUTPUT: 1567 OUTPUT:
1496 RETVAL 1568 RETVAL
1497 1569
1498void 1570void
1499DESTROY (CFPlus::Map self) 1571DESTROY (DC::Map self)
1500 CODE: 1572 CODE:
1501{ 1573{
1502 map_clear (self); 1574 map_clear (self);
1503 Safefree (self->face2tile); 1575 Safefree (self->face2tile);
1504 Safefree (self->tex); 1576 Safefree (self->tex);
1505 Safefree (self); 1577 Safefree (self);
1506} 1578}
1507 1579
1508void 1580void
1509resize (CFPlus::Map self, int map_width, int map_height) 1581resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1582 CODE:
1511 self->w = map_width; 1583 self->w = map_width;
1512 self->h = map_height; 1584 self->h = map_height;
1513 1585
1514void 1586void
1515clear (CFPlus::Map self) 1587clear (DC::Map self)
1516 CODE: 1588 CODE:
1517 map_clear (self); 1589 map_clear (self);
1518 1590
1519void 1591void
1520set_tileid (CFPlus::Map self, int face, int tile) 1592set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1593 CODE:
1522{ 1594{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1595 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1596 need_texid (self, tile);
1525} 1597}
1526 1598
1527void 1599void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1600set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1601 CODE:
1530{ 1602{
1531 tileid texid; 1603 tileid texid;
1532 maptex *tex; 1604 maptex *tex;
1533 1605
1546 tex->smoothtile = self->face2tile [smooth]; 1618 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1619 tex->smoothlevel = level;
1548} 1620}
1549 1621
1550void 1622void
1551set_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)
1552 CODE: 1624 CODE:
1553{ 1625{
1554 need_texid (self, texid); 1626 need_texid (self, texid);
1555 1627
1556 { 1628 {
1576 // from transparent color bleeding and ugly wrapping effects. 1648 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1650}
1579 1651
1580int 1652int
1581ox (CFPlus::Map self) 1653ox (DC::Map self)
1582 ALIAS: 1654 ALIAS:
1583 oy = 1 1655 oy = 1
1584 x = 2 1656 x = 2
1585 y = 3 1657 y = 3
1586 w = 4 1658 w = 4
1597 } 1669 }
1598 OUTPUT: 1670 OUTPUT:
1599 RETVAL 1671 RETVAL
1600 1672
1601void 1673void
1602scroll (CFPlus::Map self, int dx, int dy) 1674scroll (DC::Map self, int dx, int dy)
1603 CODE: 1675 CODE:
1604{ 1676{
1605 if (dx > 0) 1677 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1678 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1679 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1695 self->y += MAP_EXTEND_Y;
1624 } 1696 }
1625} 1697}
1626 1698
1627SV * 1699SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1700map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1701 CODE:
1630{ 1702{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1704 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1705 mapcell *cell;
1661 uint8_t ext, cmd; 1733 uint8_t ext, cmd;
1662 1734
1663 do 1735 do
1664 { 1736 {
1665 ext = *data++; 1737 ext = *data++;
1666 cmd = ext & 0x3f; 1738 cmd = ext & 0x7f;
1667 1739
1668 if (cmd < 4) 1740 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1741 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1742 else if (cmd == 5) // health
1671 { 1743 {
1674 } 1746 }
1675 else if (cmd == 6) // monster width 1747 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1748 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1749 else if (cmd == 0x47)
1678 { 1750 {
1679 if (*data == 4) 1751 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1755
1682 data += *data + 1; 1756 data += *data + 1;
1683 } 1757 }
1684 else if (cmd == 8) // cell flags 1758 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1759 cell->flags = *data++;
1715 } 1789 }
1716 } 1790 }
1717 } 1791 }
1718 } 1792 }
1719 else 1793 else
1720 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1721 } 1795 }
1722} 1796}
1723 OUTPUT: 1797 OUTPUT:
1724 RETVAL 1798 RETVAL
1725 1799
1726SV * 1800SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1801mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1802 CODE:
1729{ 1803{
1730 int x1, x; 1804 int x1, x;
1731 int y1, y; 1805 int y1, y;
1732 int z; 1806 int z;
1777} 1851}
1778 OUTPUT: 1852 OUTPUT:
1779 RETVAL 1853 RETVAL
1780 1854
1781void 1855void
1782draw (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)
1783 CODE: 1857 CODE:
1784{ 1858{
1785 int x, y, z; 1859 int x, y, z;
1786 1860
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 1864 smooth_key skey;
1791 1865 int pl_x, pl_y;
1866 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1867 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1868 rc_key_t key;
1794 rc_array_t *arr; 1869 rc_array_t *arr;
1870
1871 pl_tex.name = 0;
1795 1872
1796 // thats current max. sorry. 1873 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1874 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1875 if (sh > 255) sh = 255;
1799 1876
1854 tileid tile = cell->tile [z]; 1931 tileid tile = cell->tile [z];
1855 1932
1856 if (tile) 1933 if (tile)
1857 { 1934 {
1858 maptex tex = self->tex [tile]; 1935 maptex tex = self->tex [tile];
1859 int px, py; 1936 int px = (x + 1) * T - tex.w;
1937 int py = (y + 1) * T - tex.h;
1860 1938
1861 if (key.texname != tex.name) 1939 if (key.texname != tex.name)
1862 { 1940 {
1863 if (!tex.name) 1941 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1942 tex = self->tex [2]; /* missing, replace by noface */
1865 1943
1866 key.texname = tex.name; 1944 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1945 arr = rc_array (rc, &key);
1868 } 1946 }
1869 1947
1870 px = (x + 1) * T - tex.w; 1948 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1949 {
1950 pl_x = px;
1951 pl_y = py;
1952 pl_tex = tex;
1953 continue;
1954 }
1872 1955
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877 1960
1878 if (cell->flags && z == 2) 1961 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 1962 {
1880 // overlays such as the speech bubble, probably more to come 1963 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 1964 if (cell->flags & 1)
1882 { 1965 {
1883 maptex tex = self->tex [1]; 1966 maptex tex = self->tex [1];
2022 } 2105 }
2023 2106
2024 hv_clear (smooth); 2107 hv_clear (smooth);
2025 } 2108 }
2026 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
2027 glDisable (GL_BLEND); 2127 glDisable (GL_BLEND);
2028 rc_free (rc); 2128 rc_free (rc);
2029 2129
2030 // top layer: overlays such as the health bar 2130 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2131 for (y = 0; y < sh; y++)
2058 } 2158 }
2059 } 2159 }
2060} 2160}
2061 2161
2062void 2162void
2063draw_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)
2064 CODE: 2164 CODE:
2065{ 2165{
2066 static float color[16][3] = { 2166 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2167 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2168 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2218 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2219 glDisable (GL_TEXTURE_2D);
2120} 2220}
2121 2221
2122void 2222void
2123fow_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)
2124 PPCODE: 2224 PPCODE:
2125{ 2225{
2126 int x, y; 2226 int x, y;
2127 int sw1 = sw + 2; 2227 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2228 int sh1 = sh + 2;
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2237
2138 mx += self->x - 1; 2238 mx += self->x - 1;
2139 my += self->y - 1; 2239 my += self->y - 1;
2140 2240
2141 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2242
2143 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2145 { 2245 {
2146 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2299 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2300 PUSHs (darkness3_sv);
2201} 2301}
2202 2302
2203SV * 2303SV *
2204get_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)
2205 CODE: 2305 CODE:
2206{ 2306{
2207 int x, y, x1, y1; 2307 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2308 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2309 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2366 else
2267 *data++ = 0; 2367 *data++ = 0;
2268 } 2368 }
2269 } 2369 }
2270 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 {
2271 SvPOK_only (data_sv); 2374 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 }
2377
2273 RETVAL = data_sv; 2378 RETVAL = data_sv;
2274} 2379}
2275 OUTPUT: 2380 OUTPUT:
2276 RETVAL 2381 RETVAL
2277 2382
2278void 2383void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2384set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2385 PPCODE:
2281{ 2386{
2282 int x, y, z; 2387 int x, y, z;
2283 int w, h; 2388 int w, h;
2284 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;
2285 2400
2286 if (*data++ != 0) 2401 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2402 XSRETURN_EMPTY; /* version mismatch */
2288 2403
2289 w = *data++ << 8; w |= *data++; 2404 w = *data++ << 8; w |= *data++;
2304 { 2419 {
2305 maprow *row = map_get_row (self, y); 2420 maprow *row = map_get_row (self, y);
2306 2421
2307 for (x = x0; x < x1; x++) 2422 for (x = x0; x < x1; x++)
2308 { 2423 {
2424 uint8_t flags;
2425
2426 if (data + 7 >= end)
2427 XSRETURN_EMPTY;
2428
2309 uint8_t flags = *data++; 2429 flags = *data++;
2310 2430
2311 if (flags) 2431 if (flags)
2312 { 2432 {
2313 mapcell *cell = row_get_cell (row, x); 2433 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2434 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2437 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2438 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2439
2320 if (cell->darkness == 0) 2440 if (cell->darkness == 0)
2321 { 2441 {
2322 cell->darkness = 0; 2442 /*cell->darkness = 0;*/
2443 EXTEND (SP, 3);
2323 2444
2324 for (z = 0; z <= 2; z++) 2445 for (z = 0; z <= 2; z++)
2325 { 2446 {
2326 tileid t = tile [z]; 2447 tileid t = tile [z];
2327 2448
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2449 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2450 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2451 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2452 need_texid (self, t);
2332 } 2453 }
2333 2454
2334 cell->tile [z] = t; 2455 cell->tile [z] = t;
2335 } 2456 }
2337 } 2458 }
2338 } 2459 }
2339 } 2460 }
2340} 2461}
2341 2462
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2463MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2464
2344CFPlus::RW 2465DC::RW
2345new (SV *class, SV *data_sv) 2466new (SV *class, SV *data_sv)
2346 CODE: 2467 CODE:
2347{ 2468{
2348 STRLEN datalen; 2469 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2470 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2472 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2473}
2353 OUTPUT: 2474 OUTPUT:
2354 RETVAL 2475 RETVAL
2355 2476
2356CFPlus::RW 2477DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2478new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2479 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2480 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2481 OUTPUT:
2361 RETVAL 2482 RETVAL
2362 2483
2363# fails on win32: 2484# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2485# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2486#void
2366#close (CFPlus::RW self) 2487#close (DC::RW self)
2367# CODE: 2488# CODE:
2368# (self->(close)) (self); 2489# (self->(close)) (self);
2369 2490
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2491MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2492
2372PROTOTYPES: DISABLE 2493PROTOTYPES: DISABLE
2373 2494
2374CFPlus::Channel 2495DC::Channel
2375find () 2496find ()
2376 CODE: 2497 CODE:
2377{ 2498{
2378 RETVAL = Mix_GroupAvailable (-1); 2499 RETVAL = Mix_GroupAvailable (-1);
2379 2500
2392} 2513}
2393 OUTPUT: 2514 OUTPUT:
2394 RETVAL 2515 RETVAL
2395 2516
2396void 2517void
2397halt (CFPlus::Channel self) 2518halt (DC::Channel self)
2398 CODE: 2519 CODE:
2399 Mix_HaltChannel (self); 2520 Mix_HaltChannel (self);
2400 2521
2401void 2522void
2402expire (CFPlus::Channel self, int ticks = -1) 2523expire (DC::Channel self, int ticks = -1)
2403 CODE: 2524 CODE:
2404 Mix_ExpireChannel (self, ticks); 2525 Mix_ExpireChannel (self, ticks);
2405 2526
2406void 2527void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2528fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2529 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2530 Mix_FadeOutChannel (self, ticks);
2410 2531
2411int 2532int
2412volume (CFPlus::Channel self, int volume) 2533volume (DC::Channel self, int volume)
2413 CODE: 2534 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2535 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2536 OUTPUT:
2416 RETVAL 2537 RETVAL
2417 2538
2418void 2539void
2419unregister_all_effects (CFPlus::Channel self) 2540unregister_all_effects (DC::Channel self)
2420 CODE: 2541 CODE:
2421 Mix_UnregisterAllEffects (self); 2542 Mix_UnregisterAllEffects (self);
2422 2543
2423void 2544void
2424set_panning (CFPlus::Channel self, int left, int right) 2545set_panning (DC::Channel self, int left, int right)
2425 CODE: 2546 CODE:
2426 left = CLAMP (left , 0, 255); 2547 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2548 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2549 Mix_SetPanning (self, left, right);
2429 2550
2430void 2551void
2431set_distance (CFPlus::Channel self, int distance) 2552set_distance (DC::Channel self, int distance)
2432 CODE: 2553 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2554 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2555
2435void 2556void
2436set_position (CFPlus::Channel self, int angle, int distance) 2557set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2558 CODE:
2438 2559
2439void 2560void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2562 CODE:
2442{ 2563{
2443 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));
2444 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);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2567}
2447 2568
2448void 2569void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2570set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2571 CODE:
2451 Mix_SetReverseStereo (self, flip); 2572 Mix_SetReverseStereo (self, flip);
2452 2573
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2575
2455PROTOTYPES: DISABLE 2576PROTOTYPES: DISABLE
2456 2577
2457CFPlus::MixChunk 2578DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2579new (SV *class, DC::RW rwops)
2459 CODE: 2580 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2581 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2582 OUTPUT:
2462 RETVAL 2583 RETVAL
2463 2584
2464void 2585void
2465DESTROY (CFPlus::MixChunk self) 2586DESTROY (DC::MixChunk self)
2466 CODE: 2587 CODE:
2467 Mix_FreeChunk (self); 2588 Mix_FreeChunk (self);
2468 2589
2469int 2590int
2470volume (CFPlus::MixChunk self, int volume = -1) 2591volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2592 CODE:
2472 if (items > 1) 2593 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2594 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2595 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2596 OUTPUT:
2476 RETVAL 2597 RETVAL
2477 2598
2478CFPlus::Channel 2599DC::Channel
2479play (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)
2480 CODE: 2601 CODE:
2481{ 2602{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2603 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2604
2484 if (RETVAL < 0) 2605 if (RETVAL < 0)
2491 } 2612 }
2492} 2613}
2493 OUTPUT: 2614 OUTPUT:
2494 RETVAL 2615 RETVAL
2495 2616
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2618
2498int 2619int
2499volume (int volume = -1) 2620volume (int volume = -1)
2500 PROTOTYPE: ;$ 2621 PROTOTYPE: ;$
2501 CODE: 2622 CODE:
2513void 2634void
2514halt () 2635halt ()
2515 CODE: 2636 CODE:
2516 Mix_HaltMusic (); 2637 Mix_HaltMusic ();
2517 2638
2518CFPlus::MixMusic 2639DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2640new (SV *class, DC::RW rwops)
2520 CODE: 2641 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2642 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2643 OUTPUT:
2523 RETVAL 2644 RETVAL
2524 2645
2525void 2646void
2526DESTROY (CFPlus::MixMusic self) 2647DESTROY (DC::MixMusic self)
2527 CODE: 2648 CODE:
2528 Mix_FreeMusic (self); 2649 Mix_FreeMusic (self);
2529 2650
2530int 2651int
2531play (CFPlus::MixMusic self, int loops = -1) 2652play (DC::MixMusic self, int loops = -1)
2532 CODE: 2653 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2654 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2655 OUTPUT:
2535 RETVAL 2656 RETVAL
2536 2657
2537void 2658void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2659fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2660 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2661 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2662
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2663MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2664
2544PROTOTYPES: ENABLE 2665PROTOTYPES: ENABLE
2545 2666
2546BOOT: 2667BOOT:
2547{ 2668{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2669 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2670 static const struct {
2550 const char *name; 2671 const char *name;
2551 IV iv; 2672 IV iv;
2552 } *civ, const_iv[] = { 2673 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2674# define const_iv(name) { # name, (IV)name }
2846void 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)
2847 CODE: 2968 CODE:
2848 if (gl.SeparableFilter2D) 2969 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2971
2851void 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)
2852 2973
2853void 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)
2854 2975
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2976void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2977
2882 3003
2883void glEndList () 3004void glEndList ()
2884 3005
2885void glCallList (int list) 3006void glCallList (int list)
2886 3007
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3009
2889PROTOTYPES: DISABLE 3010PROTOTYPES: DISABLE
2890 3011
2891void 3012void
2892find_widget (SV *self, NV x, NV y) 3013find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3017 XPUSHs (self);
2897} 3018}
2898 3019
2899BOOT: 3020BOOT:
2900{ 3021{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3022 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3023
2903 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);
2904 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);
2905 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);
2906 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);
2907} 3028}
2908 3029
2909void 3030void
2910draw (SV *self) 3031draw (SV *self)
2911 CODE: 3032 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3039 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3040 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3041 double draw_x, draw_y;
2921 3042
2922 if (!SvROK (self)) 3043 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3044 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3045
2925 hv = (HV *)SvRV (self); 3046 hv = (HV *)SvRV (self);
2926 3047
2927 if (SvTYPE (hv) != SVt_PVHV) 3048 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3049 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3050
2930 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.;
2931 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.;
2932 3053
2933 if (!h || !w) 3054 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines