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.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.273 by root, Wed Aug 20 13:30:02 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
155 rc_t *rc; 177 rc_t *rc;
156} *CFPlus__Layout; 178} *DC__Layout;
157 179
158static CFPlus__Font default_font; 180static DC__Font default_font;
159static PangoContext *opengl_context; 181static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
161 183
162static void 184static void
163substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
168#endif 190#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 192}
171 193
172static void 194static void
173layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 204
183 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
184} 206}
185 207
186static void 208static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 210{
189 PangoRectangle rect; 211 PangoRectangle rect;
190 212
191 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
233 255
234 int32_t rows; 256 int32_t rows;
235 maprow *row; 257 maprow *row;
236} *CFPlus__Map; 258} *DC__Map;
237 259
238static char * 260static char *
239prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
240{ 262{
241 char *p; 263 char *p;
279 self->texs *= 2; 301 self->texs *= 2;
280 } 302 }
281} 303}
282 304
283static maprow * 305static maprow *
284map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
285{ 307{
286 if (0 > y) 308 if (0 > y)
287 { 309 {
288 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
327 349
328 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
329} 351}
330 352
331static mapcell * 353static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
333{ 355{
334 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
335} 357}
336 358
337static void 359static void
338map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
339{ 361{
340 int r; 362 int r;
341 363
342 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
355static void 387static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
360 mapcell *cell; 392 mapcell *cell;
361 393
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
498 return 0; 527 return 0;
499 528
500 return 1; 529 return 1;
501} 530}
502 531
503MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538}
539
540#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back.
546 */
547 extern C_LINKAGE int
548 main (int argc, char *argv[])
549 {
550 deliantra_main ();
551 }
552
553 #undef main
554
555 extern C_LINKAGE int main (int argc, char *argv[]);
556
557 static void
558 SDL_braino (void)
559 {
560 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv);
562 }
563#else
564 static void
565 SDL_braino (void)
566 {
567 deliantra_main ();
568 }
569#endif
570
571MODULE = Deliantra::Client PACKAGE = DC
504 572
505PROTOTYPES: ENABLE 573PROTOTYPES: ENABLE
506 574
507BOOT: 575BOOT:
508{ 576{
509 HV *stash = gv_stashpv ("CFPlus", 1); 577 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 578 static const struct {
511 const char *name; 579 const char *name;
512 IV iv; 580 IV iv;
513 } *civ, const_iv[] = { 581 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 582# define const_iv(name) { # name, (IV)name }
621 const_iv (KMOD_NUM), 689 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 690 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 691 const_iv (KMOD_MODE),
624 692
625 const_iv (MIX_DEFAULT_FORMAT), 693 const_iv (MIX_DEFAULT_FORMAT),
694
695 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO),
698 const_iv (SDL_INIT_CDROM),
699 const_iv (SDL_INIT_JOYSTICK),
700 const_iv (SDL_INIT_EVERYTHING),
701 const_iv (SDL_INIT_NOPARACHUTE),
702 const_iv (SDL_INIT_EVENTTHREAD),
703
704 const_iv (SDL_GL_RED_SIZE),
705 const_iv (SDL_GL_GREEN_SIZE),
706 const_iv (SDL_GL_BLUE_SIZE),
707 const_iv (SDL_GL_ALPHA_SIZE),
708 const_iv (SDL_GL_DOUBLEBUFFER),
709 const_iv (SDL_GL_BUFFER_SIZE),
710 const_iv (SDL_GL_DEPTH_SIZE),
711 const_iv (SDL_GL_STENCIL_SIZE),
712 const_iv (SDL_GL_ACCUM_RED_SIZE),
713 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
714 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
715 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
716 const_iv (SDL_GL_STEREO),
717 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
718 const_iv (SDL_GL_MULTISAMPLESAMPLES),
719 const_iv (SDL_GL_ACCELERATED_VISUAL),
720 const_iv (SDL_GL_SWAP_CONTROL),
721
722 const_iv (FOW_DARKNESS)
626# undef const_iv 723# undef const_iv
627 }; 724 };
628 725
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 756 CODE:
660{ 757{
661 opengl_fontmap = pango_opengl_font_map_new (); 758 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 759 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); 760 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
761 /*pango_context_set_font_description (opengl_context, default_font);*/
762#if PANGO_VERSION_CHECK (1, 15, 2)
763 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
764 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
765#endif
664} 766}
665 767
666char *
667SDL_GetError () 768char *SDL_GetError ()
668 769
669int 770void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 771
672void 772int SDL_Init (U32 flags)
773
774int SDL_InitSubSystem (U32 flags)
775
776void SDL_QuitSubSystem (U32 flags)
777
673SDL_Quit () 778void SDL_Quit ()
779
780int SDL_GL_SetAttribute (int attr, int value)
781
782int SDL_GL_GetAttribute (int attr)
783 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL))
785 XSRETURN_UNDEF;
786 OUTPUT:
787 RETVAL
674 788
675void 789void
676SDL_ListModes (int rgb, int alpha) 790SDL_ListModes (int rgb, int alpha)
677 PPCODE: 791 PPCODE:
678{ 792{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 806 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 807
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 808 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); 809 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 810
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 811 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 812
702 if (m && m != (SDL_Rect **)-1) 813 if (m && m != (SDL_Rect **)-1)
703 while (*m) 814 while (*m)
704 { 815 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 816 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 817 {
707 AV *av = newAV (); 818 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 819 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 820 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 821 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 863SDL_GetKeyName (int sym)
753 864
754int 865int
755SDL_GetAppState () 866SDL_GetAppState ()
756 867
868int
869SDL_GetModState ()
870
757void 871void
758poll_events () 872poll_events ()
759 PPCODE: 873 PPCODE:
760{ 874{
761 SDL_Event ev; 875 SDL_Event ev;
770 { 884 {
771 case SDL_KEYDOWN: 885 case SDL_KEYDOWN:
772 case SDL_KEYUP: 886 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 889 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 */ 890 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); 891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 892 break;
779 893
780 case SDL_ACTIVEEVENT: 894 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 913 x = ev.motion.x;
800 y = ev.motion.y; 914 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 916 }
803 917
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 919 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 920 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 921 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 922 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 923 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 924 }
811 break; 925 break;
812 926
813 case SDL_MOUSEBUTTONDOWN: 927 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 928 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 929 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 930
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 931 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 932 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 933 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 934 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 939 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 940 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 941 break;
828 } 942 }
829 943
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 945 }
832} 946}
833 947
834int 948int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1008 }
895 } 1009 }
896#endif 1010#endif
897} 1011}
898 1012
899void 1013int
900add_font (char *file) 1014add_font (char *file)
901 CODE: 1015 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT:
1018 RETVAL
903 1019
904void 1020void
905load_image_inline (SV *image_) 1021load_image_inline (SV *image_)
906 ALIAS: 1022 ALIAS:
907 load_image_file = 1 1023 load_image_file = 1
993void 1109void
994error (char *message) 1110error (char *message)
995 CODE: 1111 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1112 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1113#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1114 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1115#endif
1000 1116
1001void 1117void
1002fatal (char *message) 1118fatal (char *message)
1003 CODE: 1119 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1120 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1121#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1122 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1123#endif
1008 _exit (1); 1124 _exit (1);
1009 1125
1010void 1126void
1011_exit (int retval = 0) 1127_exit (int retval = 0)
1023#if DEBUG 1139#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1140 VALGRIND_DO_LEAK_CHECK;
1025#endif 1141#endif
1026} 1142}
1027 1143
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1144MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1145
1030PROTOTYPES: DISABLE 1146PROTOTYPES: DISABLE
1031 1147
1032CFPlus::Font 1148DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1149new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1150 CODE:
1035{ 1151{
1036 int count; 1152 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1156}
1041 OUTPUT: 1157 OUTPUT:
1042 RETVAL 1158 RETVAL
1043 1159
1044void 1160void
1045DESTROY (CFPlus::Font self) 1161DESTROY (DC::Font self)
1046 CODE: 1162 CODE:
1047 pango_font_description_free (self); 1163 pango_font_description_free (self);
1048 1164
1049void 1165void
1050make_default (CFPlus::Font self) 1166make_default (DC::Font self)
1051 PROTOTYPE: $ 1167 PROTOTYPE: $
1052 CODE: 1168 CODE:
1053 default_font = self; 1169 default_font = self;
1054 1170
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1171MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1172
1057PROTOTYPES: DISABLE 1173PROTOTYPES: DISABLE
1058 1174
1059void 1175void
1060reset_glyph_cache () 1176glyph_cache_backup ()
1061 PROTOTYPE: 1177 PROTOTYPE:
1062 CODE: 1178 CODE:
1179 tc_backup ();
1180
1181void
1182glyph_cache_restore ()
1183 PROTOTYPE:
1184 CODE:
1063 tc_clear (); 1185 tc_restore ();
1064 1186
1065CFPlus::Layout 1187DC::Layout
1066new (SV *class) 1188new (SV *class)
1067 CODE: 1189 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1190 New (0, RETVAL, 1, struct cf_layout);
1069 1191
1070 RETVAL->pl = pango_layout_new (opengl_context); 1192 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1202 layout_update_font (RETVAL);
1081 OUTPUT: 1203 OUTPUT:
1082 RETVAL 1204 RETVAL
1083 1205
1084void 1206void
1085DESTROY (CFPlus::Layout self) 1207DESTROY (DC::Layout self)
1086 CODE: 1208 CODE:
1087 g_object_unref (self->pl); 1209 g_object_unref (self->pl);
1088 rc_free (self->rc); 1210 rc_free (self->rc);
1089 Safefree (self); 1211 Safefree (self);
1090 1212
1091void 1213void
1092set_text (CFPlus::Layout self, SV *text_) 1214set_text (DC::Layout self, SV *text_)
1093 CODE: 1215 CODE:
1094{ 1216{
1095 STRLEN textlen; 1217 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1218 char *text = SvPVutf8 (text_, textlen);
1097 1219
1098 pango_layout_set_text (self->pl, text, textlen); 1220 pango_layout_set_text (self->pl, text, textlen);
1099} 1221}
1100 1222
1101void 1223void
1102set_markup (CFPlus::Layout self, SV *text_) 1224set_markup (DC::Layout self, SV *text_)
1103 CODE: 1225 CODE:
1104{ 1226{
1105 STRLEN textlen; 1227 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1228 char *text = SvPVutf8 (text_, textlen);
1107 1229
1108 pango_layout_set_markup (self->pl, text, textlen); 1230 pango_layout_set_markup (self->pl, text, textlen);
1109} 1231}
1110 1232
1111void 1233void
1112set_shapes (CFPlus::Layout self, ...) 1234set_shapes (DC::Layout self, ...)
1113 CODE: 1235 CODE:
1114{ 1236{
1115 PangoAttrList *attrs = 0; 1237 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1238 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1239 const char *pos = text;
1152 if (attrs) 1274 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1275 pango_layout_set_attributes (self->pl, attrs);
1154} 1276}
1155 1277
1156void 1278void
1157get_shapes (CFPlus::Layout self) 1279get_shapes (DC::Layout self)
1158 PPCODE: 1280 PPCODE:
1159{ 1281{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1282 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1283
1162 do 1284 do
1163 { 1285 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1286 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1287
1166 if (run && shape_attr_p (run)) 1288 if (run && shape_attr_p (run))
1167 { 1289 {
1168 PangoRectangle extents; 1290 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1291 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1299
1178 pango_layout_iter_free (iter); 1300 pango_layout_iter_free (iter);
1179} 1301}
1180 1302
1181int 1303int
1182has_wrapped (CFPlus::Layout self) 1304has_wrapped (DC::Layout self)
1183 CODE: 1305 CODE:
1184{ 1306{
1185 int lines = 1; 1307 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1308 const char *text = pango_layout_get_text (self->pl);
1187 1309
1192} 1314}
1193 OUTPUT: 1315 OUTPUT:
1194 RETVAL 1316 RETVAL
1195 1317
1196SV * 1318SV *
1197get_text (CFPlus::Layout self) 1319get_text (DC::Layout self)
1198 CODE: 1320 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1321 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1322 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1323 OUTPUT:
1202 RETVAL 1324 RETVAL
1203 1325
1204void 1326void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1327set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1328 CODE:
1207 self->r = r; 1329 self->r = r;
1208 self->g = g; 1330 self->g = g;
1209 self->b = b; 1331 self->b = b;
1210 self->a = a; 1332 self->a = a;
1211 1333
1212void 1334void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1335set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1336 CODE:
1215 if (self->font != font) 1337 if (self->font != font)
1216 { 1338 {
1217 self->font = font; 1339 self->font = font;
1218 layout_update_font (self); 1340 layout_update_font (self);
1219 } 1341 }
1220 1342
1221void 1343void
1222set_height (CFPlus::Layout self, int base_height) 1344set_height (DC::Layout self, int base_height)
1223 CODE: 1345 CODE:
1224 if (self->base_height != base_height) 1346 if (self->base_height != base_height)
1225 { 1347 {
1226 self->base_height = base_height; 1348 self->base_height = base_height;
1227 layout_update_font (self); 1349 layout_update_font (self);
1228 } 1350 }
1229 1351
1230void 1352void
1231set_width (CFPlus::Layout self, int max_width = -1) 1353set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1354 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1355 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1356
1235void 1357void
1236set_indent (CFPlus::Layout self, int indent) 1358set_indent (DC::Layout self, int indent)
1237 CODE: 1359 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1360 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1361
1240void 1362void
1241set_spacing (CFPlus::Layout self, int spacing) 1363set_spacing (DC::Layout self, int spacing)
1242 CODE: 1364 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1365 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1366
1245void 1367void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1368set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1369 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1370 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1371 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1372 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1373 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1374 : PANGO_ELLIPSIZE_NONE
1253 ); 1375 );
1254 1376
1255void 1377void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1378set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1379 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1380 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1381
1260void 1382void
1261size (CFPlus::Layout self) 1383size (DC::Layout self)
1262 PPCODE: 1384 PPCODE:
1263{ 1385{
1264 int w, h; 1386 int w, h;
1265 1387
1266 layout_get_pixel_size (self, &w, &h); 1388 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1391 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1392 PUSHs (sv_2mortal (newSViv (h)));
1271} 1393}
1272 1394
1273int 1395int
1274descent (CFPlus::Layout self) 1396descent (DC::Layout self)
1275 CODE: 1397 CODE:
1276{ 1398{
1277 PangoRectangle rect; 1399 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1400 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1401 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1402 RETVAL = PANGO_DESCENT (rect);
1281} 1403}
1282 OUTPUT: 1404 OUTPUT:
1283 RETVAL 1405 RETVAL
1284 1406
1285int 1407int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1408xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1409 CODE:
1288{ 1410{
1289 int index, trailing; 1411 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1412 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1413 RETVAL = index + trailing;
1292} 1414}
1293 OUTPUT: 1415 OUTPUT:
1294 RETVAL 1416 RETVAL
1295 1417
1296void 1418void
1297cursor_pos (CFPlus::Layout self, int index) 1419cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1420 PPCODE:
1299{ 1421{
1300 PangoRectangle strong_pos; 1422 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1423 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1424
1303 EXTEND (SP, 3); 1425 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1428 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1429}
1308 1430
1309void 1431void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1432index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1433 PPCODE:
1312{ 1434{
1313 int line, x; 1435 int line, x;
1314 1436
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1437 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1438#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1439 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1440 --line;
1441#endif
1318 EXTEND (SP, 2); 1442 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1443 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1444 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1445}
1322 1446
1323void 1447void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1448line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1449 PPCODE:
1326{ 1450{
1327 PangoLayoutLine *lp; 1451 PangoLayoutLine *lp;
1328 int index, trailing; 1452 int index, trailing;
1329 1453
1330 if (line < 0) 1454 if (line < 0)
1331 XSRETURN_EMPTY; 1455 XSRETURN_EMPTY;
1332 1456
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1457 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1458 XSRETURN_EMPTY; /* do better */
1335 1459
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1460 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1461
1338 EXTEND (SP, 2); 1462 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1468 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1469 }
1346} 1470}
1347 1471
1348void 1472void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1473render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1474 CODE:
1351 rc_clear (self->rc); 1475 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1476 pango_opengl_render_layout_subpixel (
1353 self->pl, 1477 self->pl,
1354 self->rc, 1478 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1483 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1484 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1485 pango_layout_context_changed (self->pl);
1362 1486
1363void 1487void
1364draw (CFPlus::Layout self) 1488draw (DC::Layout self)
1365 CODE: 1489 CODE:
1366{ 1490{
1367 glEnable (GL_TEXTURE_2D); 1491 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1492 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1493 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1501 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1502 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1503 glDisable (GL_TEXTURE_2D);
1380} 1504}
1381 1505
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1506MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1507
1384PROTOTYPES: ENABLE 1508PROTOTYPES: ENABLE
1385 1509
1386void 1510void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1511pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1590 RETVAL = width > 0;
1467} 1591}
1468 OUTPUT: 1592 OUTPUT:
1469 RETVAL 1593 RETVAL
1470 1594
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1595MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1596
1473PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1474 1598
1475CFPlus::Map 1599DC::Map
1476new (SV *class) 1600new (SV *class)
1477 CODE: 1601 CODE:
1478 New (0, RETVAL, 1, struct map); 1602 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1603 RETVAL->x = 0;
1480 RETVAL->y = 0; 1604 RETVAL->y = 0;
1488 RETVAL->row = 0; 1612 RETVAL->row = 0;
1489 OUTPUT: 1613 OUTPUT:
1490 RETVAL 1614 RETVAL
1491 1615
1492void 1616void
1493DESTROY (CFPlus::Map self) 1617DESTROY (DC::Map self)
1494 CODE: 1618 CODE:
1495{ 1619{
1496 map_clear (self); 1620 map_clear (self);
1497 Safefree (self->face2tile); 1621 Safefree (self->face2tile);
1498 Safefree (self->tex); 1622 Safefree (self->tex);
1499 Safefree (self); 1623 Safefree (self);
1500} 1624}
1501 1625
1502void 1626void
1503resize (CFPlus::Map self, int map_width, int map_height) 1627resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1628 CODE:
1505 self->w = map_width; 1629 self->w = map_width;
1506 self->h = map_height; 1630 self->h = map_height;
1507 1631
1508void 1632void
1509clear (CFPlus::Map self) 1633clear (DC::Map self)
1510 CODE: 1634 CODE:
1511 map_clear (self); 1635 map_clear (self);
1512 1636
1513void 1637void
1514set_tileid (CFPlus::Map self, int face, int tile) 1638set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1639 CODE:
1516{ 1640{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1641 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1642 need_texid (self, tile);
1519} 1643}
1520 1644
1521void 1645void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1646set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1647 CODE:
1524{ 1648{
1525 tileid texid; 1649 tileid texid;
1526 maptex *tex; 1650 maptex *tex;
1527 1651
1540 tex->smoothtile = self->face2tile [smooth]; 1664 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1665 tex->smoothlevel = level;
1542} 1666}
1543 1667
1544void 1668void
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) 1669set_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: 1670 CODE:
1547{ 1671{
1548 need_texid (self, texid); 1672 need_texid (self, texid);
1549 1673
1550 { 1674 {
1570 // from transparent color bleeding and ugly wrapping effects. 1694 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1696}
1573 1697
1574int 1698int
1575ox (CFPlus::Map self) 1699ox (DC::Map self)
1576 ALIAS: 1700 ALIAS:
1577 oy = 1 1701 oy = 1
1578 x = 2 1702 x = 2
1579 y = 3 1703 y = 3
1580 w = 4 1704 w = 4
1591 } 1715 }
1592 OUTPUT: 1716 OUTPUT:
1593 RETVAL 1717 RETVAL
1594 1718
1595void 1719void
1596scroll (CFPlus::Map self, int dx, int dy) 1720scroll (DC::Map self, int dx, int dy)
1597 CODE: 1721 CODE:
1598{ 1722{
1599 if (dx > 0) 1723 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1724 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1725 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1741 self->y += MAP_EXTEND_Y;
1618 } 1742 }
1619} 1743}
1620 1744
1621SV * 1745SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1746map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1747 CODE:
1624{ 1748{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1750 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1751 mapcell *cell;
1655 uint8_t ext, cmd; 1779 uint8_t ext, cmd;
1656 1780
1657 do 1781 do
1658 { 1782 {
1659 ext = *data++; 1783 ext = *data++;
1660 cmd = ext & 0x3f; 1784 cmd = ext & 0x7f;
1661 1785
1662 if (cmd < 4) 1786 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1787 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1788 else if (cmd == 5) // health
1665 { 1789 {
1668 } 1792 }
1669 else if (cmd == 6) // monster width 1793 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1794 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1795 else if (cmd == 0x47)
1672 { 1796 {
1673 if (*data == 4) 1797 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1801
1676 data += *data + 1; 1802 data += *data + 1;
1677 } 1803 }
1678 else if (cmd == 8) // cell flags 1804 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1805 cell->flags = *data++;
1709 } 1835 }
1710 } 1836 }
1711 } 1837 }
1712 } 1838 }
1713 else 1839 else
1714 cell->darkness = 0; 1840 CELL_CLEAR (cell);
1715 } 1841 }
1716} 1842}
1717 OUTPUT: 1843 OUTPUT:
1718 RETVAL 1844 RETVAL
1719 1845
1720SV * 1846SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1847mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1848 CODE:
1723{ 1849{
1724 int x1, x; 1850 int x1, x;
1725 int y1, y; 1851 int y1, y;
1726 int z; 1852 int z;
1771} 1897}
1772 OUTPUT: 1898 OUTPUT:
1773 RETVAL 1899 RETVAL
1774 1900
1775void 1901void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 1903 CODE:
1778{ 1904{
1779 int x, y, z; 1905 int x, y, z;
1780 1906
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1908 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) 1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 1910 smooth_key skey;
1785 1911 int pl_x, pl_y;
1912 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1913 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1914 rc_key_t key;
1788 rc_array_t *arr; 1915 rc_array_t *arr;
1916
1917 pl_tex.name = 0;
1789 1918
1790 // thats current max. sorry. 1919 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1920 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1921 if (sh > 255) sh = 255;
1793 1922
1848 tileid tile = cell->tile [z]; 1977 tileid tile = cell->tile [z];
1849 1978
1850 if (tile) 1979 if (tile)
1851 { 1980 {
1852 maptex tex = self->tex [tile]; 1981 maptex tex = self->tex [tile];
1853 int px, py; 1982 int px = (x + 1) * T - tex.w;
1983 int py = (y + 1) * T - tex.h;
1854 1984
1855 if (key.texname != tex.name) 1985 if (key.texname != tex.name)
1856 { 1986 {
1857 if (!tex.name) 1987 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 1988 tex = self->tex [2]; /* missing, replace by noface */
1859 1989
1860 key.texname = tex.name; 1990 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 1991 arr = rc_array (rc, &key);
1862 } 1992 }
1863 1993
1864 px = (x + 1) * T - tex.w; 1994 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 1995 {
1996 pl_x = px;
1997 pl_y = py;
1998 pl_tex = tex;
1999 continue;
2000 }
1866 2001
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2003 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); 2004 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); 2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871 2006
1872 if (cell->flags && z == 2) 2007 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 2008 {
1874 // overlays such as the speech bubble, probably more to come 2009 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 2010 if (cell->flags & 1)
1876 { 2011 {
1877 maptex tex = self->tex [1]; 2012 maptex tex = self->tex [1];
2016 } 2151 }
2017 2152
2018 hv_clear (smooth); 2153 hv_clear (smooth);
2019 } 2154 }
2020 2155
2156 if (pl_tex.name)
2157 {
2158 maptex tex = pl_tex;
2159 int px = pl_x + sdx;
2160 int py = pl_y + sdy;
2161
2162 key.texname = tex.name;
2163 arr = rc_array (rc, &key);
2164
2165 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169
2170 rc_draw (rc);
2171 }
2172
2021 glDisable (GL_BLEND); 2173 glDisable (GL_BLEND);
2022 rc_free (rc); 2174 rc_free (rc);
2023 2175
2024 // top layer: overlays such as the health bar 2176 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2177 for (y = 0; y < sh; y++)
2052 } 2204 }
2053 } 2205 }
2054} 2206}
2055 2207
2056void 2208void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2210 CODE:
2059{ 2211{
2060 static float color[16][3] = { 2212 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2213 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2214 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2264 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2265 glDisable (GL_TEXTURE_2D);
2114} 2266}
2115 2267
2116void 2268void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2269fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2270 PPCODE:
2119{ 2271{
2120 int x, y; 2272 int x, y;
2121 int sw1 = sw + 2; 2273 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2274 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2282 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2283
2132 mx += self->x - 1; 2284 mx += self->x - 1;
2133 my += self->y - 1; 2285 my += self->y - 1;
2134 2286
2135 memset (darkness1, 255, sw1 * sh1); 2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2288
2137 for (y = 0; y < sh1; y++) 2289 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2290 if (0 <= y + my && y + my < self->rows)
2139 { 2291 {
2140 maprow *row = self->row + (y + my); 2292 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2345 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2346 PUSHs (darkness3_sv);
2195} 2347}
2196 2348
2197SV * 2349SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2350get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2351 CODE:
2200{ 2352{
2201 int x, y, x1, y1; 2353 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2354 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2355 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2412 else
2261 *data++ = 0; 2413 *data++ = 0;
2262 } 2414 }
2263 } 2415 }
2264 2416
2417 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 {
2265 SvPOK_only (data_sv); 2420 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 }
2423
2267 RETVAL = data_sv; 2424 RETVAL = data_sv;
2268} 2425}
2269 OUTPUT: 2426 OUTPUT:
2270 RETVAL 2427 RETVAL
2271 2428
2272void 2429void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2430set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2431 PPCODE:
2275{ 2432{
2276 int x, y, z; 2433 int x, y, z;
2277 int w, h; 2434 int w, h;
2278 int x1, y1; 2435 int x1, y1;
2436 STRLEN len;
2437 uint8_t *data, *end;
2438
2439 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv);
2442 end = data + len + 8;
2443
2444 if (len < 5)
2445 XSRETURN_EMPTY;
2279 2446
2280 if (*data++ != 0) 2447 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2448 XSRETURN_EMPTY; /* version mismatch */
2282 2449
2283 w = *data++ << 8; w |= *data++; 2450 w = *data++ << 8; w |= *data++;
2298 { 2465 {
2299 maprow *row = map_get_row (self, y); 2466 maprow *row = map_get_row (self, y);
2300 2467
2301 for (x = x0; x < x1; x++) 2468 for (x = x0; x < x1; x++)
2302 { 2469 {
2470 uint8_t flags;
2471
2472 if (data + 7 >= end)
2473 XSRETURN_EMPTY;
2474
2303 uint8_t flags = *data++; 2475 flags = *data++;
2304 2476
2305 if (flags) 2477 if (flags)
2306 { 2478 {
2307 mapcell *cell = row_get_cell (row, x); 2479 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2480 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2483 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2484 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2485
2314 if (cell->darkness == 0) 2486 if (cell->darkness == 0)
2315 { 2487 {
2316 cell->darkness = 0; 2488 /*cell->darkness = 0;*/
2489 EXTEND (SP, 3);
2317 2490
2318 for (z = 0; z <= 2; z++) 2491 for (z = 0; z <= 2; z++)
2319 { 2492 {
2320 tileid t = tile [z]; 2493 tileid t = tile [z];
2321 2494
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2495 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2496 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2497 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2498 need_texid (self, t);
2326 } 2499 }
2327 2500
2328 cell->tile [z] = t; 2501 cell->tile [z] = t;
2329 } 2502 }
2331 } 2504 }
2332 } 2505 }
2333 } 2506 }
2334} 2507}
2335 2508
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2509MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2510
2338CFPlus::RW 2511DC::RW
2339new (SV *class, SV *data_sv) 2512new (SV *class, SV *data_sv)
2340 CODE: 2513 CODE:
2341{ 2514{
2342 STRLEN datalen; 2515 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2516 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2518 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2519}
2347 OUTPUT: 2520 OUTPUT:
2348 RETVAL 2521 RETVAL
2349 2522
2350CFPlus::RW 2523DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2524new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2525 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2526 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2527 OUTPUT:
2355 RETVAL 2528 RETVAL
2356 2529
2357# fails on win32: 2530# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2531# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2532#void
2360#close (CFPlus::RW self) 2533#close (DC::RW self)
2361# CODE: 2534# CODE:
2362# (self->(close)) (self); 2535# (self->(close)) (self);
2363 2536
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2537MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2538
2366PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2367 2540
2368CFPlus::Channel 2541DC::Channel
2369find () 2542find ()
2370 CODE: 2543 CODE:
2371{ 2544{
2372 RETVAL = Mix_GroupAvailable (-1); 2545 RETVAL = Mix_GroupAvailable (-1);
2373 2546
2386} 2559}
2387 OUTPUT: 2560 OUTPUT:
2388 RETVAL 2561 RETVAL
2389 2562
2390void 2563void
2391halt (CFPlus::Channel self) 2564halt (DC::Channel self)
2392 CODE: 2565 CODE:
2393 Mix_HaltChannel (self); 2566 Mix_HaltChannel (self);
2394 2567
2395void 2568void
2396expire (CFPlus::Channel self, int ticks = -1) 2569expire (DC::Channel self, int ticks = -1)
2397 CODE: 2570 CODE:
2398 Mix_ExpireChannel (self, ticks); 2571 Mix_ExpireChannel (self, ticks);
2399 2572
2400void 2573void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2574fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2575 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2576 Mix_FadeOutChannel (self, ticks);
2404 2577
2405int 2578int
2406volume (CFPlus::Channel self, int volume) 2579volume (DC::Channel self, int volume)
2407 CODE: 2580 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2581 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2582 OUTPUT:
2410 RETVAL 2583 RETVAL
2411 2584
2412void 2585void
2413unregister_all_effects (CFPlus::Channel self) 2586unregister_all_effects (DC::Channel self)
2414 CODE: 2587 CODE:
2415 Mix_UnregisterAllEffects (self); 2588 Mix_UnregisterAllEffects (self);
2416 2589
2417void 2590void
2418set_panning (CFPlus::Channel self, int left, int right) 2591set_panning (DC::Channel self, int left, int right)
2419 CODE: 2592 CODE:
2420 left = CLAMP (left , 0, 255); 2593 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2594 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2595 Mix_SetPanning (self, left, right);
2423 2596
2424void 2597void
2425set_distance (CFPlus::Channel self, int distance) 2598set_distance (DC::Channel self, int distance)
2426 CODE: 2599 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2600 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2601
2429void 2602void
2430set_position (CFPlus::Channel self, int angle, int distance) 2603set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2604 CODE:
2432 2605
2433void 2606void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2608 CODE:
2436{ 2609{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2610 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); 2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2613}
2441 2614
2442void 2615void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2616set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2617 CODE:
2445 Mix_SetReverseStereo (self, flip); 2618 Mix_SetReverseStereo (self, flip);
2446 2619
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2621
2449PROTOTYPES: DISABLE 2622PROTOTYPES: DISABLE
2450 2623
2451CFPlus::MixChunk 2624DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2625new (SV *class, DC::RW rwops)
2453 CODE: 2626 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2627 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2628 OUTPUT:
2456 RETVAL 2629 RETVAL
2457 2630
2458void 2631void
2459DESTROY (CFPlus::MixChunk self) 2632DESTROY (DC::MixChunk self)
2460 CODE: 2633 CODE:
2461 Mix_FreeChunk (self); 2634 Mix_FreeChunk (self);
2462 2635
2463int 2636int
2464volume (CFPlus::MixChunk self, int volume = -1) 2637volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2638 CODE:
2466 if (items > 1) 2639 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2640 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2641 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2642 OUTPUT:
2470 RETVAL 2643 RETVAL
2471 2644
2472CFPlus::Channel 2645DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2646play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2647 CODE:
2475{ 2648{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2649 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2650
2478 if (RETVAL < 0) 2651 if (RETVAL < 0)
2485 } 2658 }
2486} 2659}
2487 OUTPUT: 2660 OUTPUT:
2488 RETVAL 2661 RETVAL
2489 2662
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2664
2492int 2665int
2493volume (int volume = -1) 2666volume (int volume = -1)
2494 PROTOTYPE: ;$ 2667 PROTOTYPE: ;$
2495 CODE: 2668 CODE:
2507void 2680void
2508halt () 2681halt ()
2509 CODE: 2682 CODE:
2510 Mix_HaltMusic (); 2683 Mix_HaltMusic ();
2511 2684
2512CFPlus::MixMusic 2685DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2686new (SV *class, DC::RW rwops)
2514 CODE: 2687 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2688 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2689 OUTPUT:
2517 RETVAL 2690 RETVAL
2518 2691
2519void 2692void
2520DESTROY (CFPlus::MixMusic self) 2693DESTROY (DC::MixMusic self)
2521 CODE: 2694 CODE:
2522 Mix_FreeMusic (self); 2695 Mix_FreeMusic (self);
2523 2696
2524int 2697int
2525play (CFPlus::MixMusic self, int loops = -1) 2698play (DC::MixMusic self, int loops = -1)
2526 CODE: 2699 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2700 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2701 OUTPUT:
2529 RETVAL 2702 RETVAL
2530 2703
2531void 2704void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2705fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2706 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2707 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2708
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2709MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2710
2538PROTOTYPES: ENABLE 2711PROTOTYPES: ENABLE
2539 2712
2540BOOT: 2713BOOT:
2541{ 2714{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2715 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2716 static const struct {
2544 const char *name; 2717 const char *name;
2545 IV iv; 2718 IV iv;
2546 } *civ, const_iv[] = { 2719 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2720# 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) 3013void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3014 CODE:
2842 if (gl.SeparableFilter2D) 3015 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3016 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3017
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3018void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3019
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3020void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3021
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3022void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3023
2876 3049
2877void glEndList () 3050void glEndList ()
2878 3051
2879void glCallList (int list) 3052void glCallList (int list)
2880 3053
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3055
2883PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2884 3057
2885void 3058void
2886find_widget (SV *self, NV x, NV y) 3059find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3063 XPUSHs (self);
2891} 3064}
2892 3065
2893BOOT: 3066BOOT:
2894{ 3067{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3068 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3069
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3070 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); 3071 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); 3072 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); 3073 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3074}
2902 3075
2903void 3076void
2904draw (SV *self) 3077draw (SV *self)
2905 CODE: 3078 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3085 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3086 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3087 double draw_x, draw_y;
2915 3088
2916 if (!SvROK (self)) 3089 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3090 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3091
2919 hv = (HV *)SvRV (self); 3092 hv = (HV *)SvRV (self);
2920 3093
2921 if (SvTYPE (hv) != SVt_PVHV) 3094 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3095 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3096
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3097 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.; 3098 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3099
2927 if (!h || !w) 3100 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines