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.263 by root, Fri Jul 18 21:18:42 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);
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
355static void 372static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 374{
358 int x, y; 375 int x, y;
359 maprow *row; 376 maprow *row;
360 mapcell *cell; 377 mapcell *cell;
361 378
498 return 0; 515 return 0;
499 516
500 return 1; 517 return 1;
501} 518}
502 519
503MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
504 521
505PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
506 523
507BOOT: 524BOOT:
508{ 525{
509 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 527 static const struct {
511 const char *name; 528 const char *name;
512 IV iv; 529 IV iv;
513 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
621 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
624 641
625 const_iv (MIX_DEFAULT_FORMAT), 642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
626# undef const_iv 652# undef const_iv
627 }; 653 };
628 654
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 685 CODE:
660{ 686{
661 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 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); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
694#endif
664} 695}
665 696
666char *
667SDL_GetError () 697char *SDL_GetError ()
668 698
669int 699int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 700
672void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
673SDL_Quit () 705void SDL_Quit ()
674 706
675void 707void
676SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
677 PPCODE: 709 PPCODE:
678{ 710{
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 733
702 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
703 while (*m) 735 while (*m)
704 { 736 {
705 if ((*m)->w >= 800 && (*m)->h >= 600)
706 {
707 AV *av = newAV (); 737 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
711 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
712 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713 }
714 743
715 ++m; 744 ++m;
716 } 745 }
717} 746}
718 747
751char * 780char *
752SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
753 782
754int 783int
755SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
756 788
757void 789void
758poll_events () 790poll_events ()
759 PPCODE: 791 PPCODE:
760{ 792{
770 { 802 {
771 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
772 case SDL_KEYUP: 804 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 807 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 */ 808 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); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 810 break;
779 811
780 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 831 x = ev.motion.x;
800 y = ev.motion.y; 832 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 834 }
803 835
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 842 }
811 break; 843 break;
812 844
813 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 848
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 859 break;
828 } 860 }
829 861
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 863 }
832} 864}
833 865
834int 866int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 926 }
895 } 927 }
896#endif 928#endif
897} 929}
898 930
899void 931int
900add_font (char *file) 932add_font (char *file)
901 CODE: 933 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
903 937
904void 938void
905load_image_inline (SV *image_) 939load_image_inline (SV *image_)
906 ALIAS: 940 ALIAS:
907 load_image_file = 1 941 load_image_file = 1
993void 1027void
994error (char *message) 1028error (char *message)
995 CODE: 1029 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1031#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1033#endif
1000 1034
1001void 1035void
1002fatal (char *message) 1036fatal (char *message)
1003 CODE: 1037 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1039#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1041#endif
1008 _exit (1); 1042 _exit (1);
1009 1043
1010void 1044void
1011_exit (int retval = 0) 1045_exit (int retval = 0)
1023#if DEBUG 1057#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1058 VALGRIND_DO_LEAK_CHECK;
1025#endif 1059#endif
1026} 1060}
1027 1061
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1063
1030PROTOTYPES: DISABLE 1064PROTOTYPES: DISABLE
1031 1065
1032CFPlus::Font 1066DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1068 CODE:
1035{ 1069{
1036 int count; 1070 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1074}
1041 OUTPUT: 1075 OUTPUT:
1042 RETVAL 1076 RETVAL
1043 1077
1044void 1078void
1045DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
1046 CODE: 1080 CODE:
1047 pango_font_description_free (self); 1081 pango_font_description_free (self);
1048 1082
1049void 1083void
1050make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1051 PROTOTYPE: $ 1085 PROTOTYPE: $
1052 CODE: 1086 CODE:
1053 default_font = self; 1087 default_font = self;
1054 1088
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1090
1057PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1058 1092
1059void 1093void
1060glyph_cache_backup () 1094glyph_cache_backup ()
1066glyph_cache_restore () 1100glyph_cache_restore ()
1067 PROTOTYPE: 1101 PROTOTYPE:
1068 CODE: 1102 CODE:
1069 tc_restore (); 1103 tc_restore ();
1070 1104
1071CFPlus::Layout 1105DC::Layout
1072new (SV *class) 1106new (SV *class)
1073 CODE: 1107 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
1075 1109
1076 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
1087 OUTPUT: 1121 OUTPUT:
1088 RETVAL 1122 RETVAL
1089 1123
1090void 1124void
1091DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
1092 CODE: 1126 CODE:
1093 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1094 rc_free (self->rc); 1128 rc_free (self->rc);
1095 Safefree (self); 1129 Safefree (self);
1096 1130
1097void 1131void
1098set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
1099 CODE: 1133 CODE:
1100{ 1134{
1101 STRLEN textlen; 1135 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1103 1137
1104 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
1105} 1139}
1106 1140
1107void 1141void
1108set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
1109 CODE: 1143 CODE:
1110{ 1144{
1111 STRLEN textlen; 1145 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
1113 1147
1114 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
1115} 1149}
1116 1150
1117void 1151void
1118set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
1119 CODE: 1153 CODE:
1120{ 1154{
1121 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1157 const char *pos = text;
1158 if (attrs) 1192 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
1160} 1194}
1161 1195
1162void 1196void
1163get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
1164 PPCODE: 1198 PPCODE:
1165{ 1199{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1201
1168 do 1202 do
1169 { 1203 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1205
1172 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1173 { 1207 {
1174 PangoRectangle extents; 1208 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1217
1184 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
1185} 1219}
1186 1220
1187int 1221int
1188has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
1189 CODE: 1223 CODE:
1190{ 1224{
1191 int lines = 1; 1225 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
1193 1227
1198} 1232}
1199 OUTPUT: 1233 OUTPUT:
1200 RETVAL 1234 RETVAL
1201 1235
1202SV * 1236SV *
1203get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
1204 CODE: 1238 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1241 OUTPUT:
1208 RETVAL 1242 RETVAL
1209 1243
1210void 1244void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1245set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1246 CODE:
1213 self->r = r; 1247 self->r = r;
1214 self->g = g; 1248 self->g = g;
1215 self->b = b; 1249 self->b = b;
1216 self->a = a; 1250 self->a = a;
1217 1251
1218void 1252void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1254 CODE:
1221 if (self->font != font) 1255 if (self->font != font)
1222 { 1256 {
1223 self->font = font; 1257 self->font = font;
1224 layout_update_font (self); 1258 layout_update_font (self);
1225 } 1259 }
1226 1260
1227void 1261void
1228set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
1229 CODE: 1263 CODE:
1230 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
1231 { 1265 {
1232 self->base_height = base_height; 1266 self->base_height = base_height;
1233 layout_update_font (self); 1267 layout_update_font (self);
1234 } 1268 }
1235 1269
1236void 1270void
1237set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1272 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1273 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1274
1241void 1275void
1242set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1243 CODE: 1277 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1279
1246void 1280void
1247set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1248 CODE: 1282 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1284
1251void 1285void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1287 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1259 ); 1293 );
1260 1294
1261void 1295void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1297 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1299
1266void 1300void
1267size (CFPlus::Layout self) 1301size (DC::Layout self)
1268 PPCODE: 1302 PPCODE:
1269{ 1303{
1270 int w, h; 1304 int w, h;
1271 1305
1272 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1277} 1311}
1278 1312
1279int 1313int
1280descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1281 CODE: 1315 CODE:
1282{ 1316{
1283 PangoRectangle rect; 1317 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1287} 1321}
1288 OUTPUT: 1322 OUTPUT:
1289 RETVAL 1323 RETVAL
1290 1324
1291int 1325int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1327 CODE:
1294{ 1328{
1295 int index, trailing; 1329 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1330 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1298} 1332}
1299 OUTPUT: 1333 OUTPUT:
1300 RETVAL 1334 RETVAL
1301 1335
1302void 1336void
1303cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1338 PPCODE:
1305{ 1339{
1306 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1342
1309 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1347}
1314 1348
1315void 1349void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1351 PPCODE:
1318{ 1352{
1319 int line, x; 1353 int line, x;
1320 1354
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1358 --line;
1359#endif
1324 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1363}
1328 1364
1329void 1365void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1367 PPCODE:
1332{ 1368{
1333 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1334 int index, trailing; 1370 int index, trailing;
1335 1371
1336 if (line < 0) 1372 if (line < 0)
1337 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1338 1374
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1341 1377
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1379
1344 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1387 }
1352} 1388}
1353 1389
1354void 1390void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1392 CODE:
1357 rc_clear (self->rc); 1393 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1359 self->pl, 1395 self->pl,
1360 self->rc, 1396 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1401 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1402 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1403 pango_layout_context_changed (self->pl);
1368 1404
1369void 1405void
1370draw (CFPlus::Layout self) 1406draw (DC::Layout self)
1371 CODE: 1407 CODE:
1372{ 1408{
1373 glEnable (GL_TEXTURE_2D); 1409 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1410 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1411 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1419 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1420 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1421 glDisable (GL_TEXTURE_2D);
1386} 1422}
1387 1423
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1424MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1425
1390PROTOTYPES: ENABLE 1426PROTOTYPES: ENABLE
1391 1427
1392void 1428void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1429pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1508 RETVAL = width > 0;
1473} 1509}
1474 OUTPUT: 1510 OUTPUT:
1475 RETVAL 1511 RETVAL
1476 1512
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1514
1479PROTOTYPES: DISABLE 1515PROTOTYPES: DISABLE
1480 1516
1481CFPlus::Map 1517DC::Map
1482new (SV *class) 1518new (SV *class)
1483 CODE: 1519 CODE:
1484 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1521 RETVAL->x = 0;
1486 RETVAL->y = 0; 1522 RETVAL->y = 0;
1494 RETVAL->row = 0; 1530 RETVAL->row = 0;
1495 OUTPUT: 1531 OUTPUT:
1496 RETVAL 1532 RETVAL
1497 1533
1498void 1534void
1499DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1500 CODE: 1536 CODE:
1501{ 1537{
1502 map_clear (self); 1538 map_clear (self);
1503 Safefree (self->face2tile); 1539 Safefree (self->face2tile);
1504 Safefree (self->tex); 1540 Safefree (self->tex);
1505 Safefree (self); 1541 Safefree (self);
1506} 1542}
1507 1543
1508void 1544void
1509resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1546 CODE:
1511 self->w = map_width; 1547 self->w = map_width;
1512 self->h = map_height; 1548 self->h = map_height;
1513 1549
1514void 1550void
1515clear (CFPlus::Map self) 1551clear (DC::Map self)
1516 CODE: 1552 CODE:
1517 map_clear (self); 1553 map_clear (self);
1518 1554
1519void 1555void
1520set_tileid (CFPlus::Map self, int face, int tile) 1556set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1557 CODE:
1522{ 1558{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1559 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1560 need_texid (self, tile);
1525} 1561}
1526 1562
1527void 1563void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1564set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1565 CODE:
1530{ 1566{
1531 tileid texid; 1567 tileid texid;
1532 maptex *tex; 1568 maptex *tex;
1533 1569
1546 tex->smoothtile = self->face2tile [smooth]; 1582 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1583 tex->smoothlevel = level;
1548} 1584}
1549 1585
1550void 1586void
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) 1587set_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: 1588 CODE:
1553{ 1589{
1554 need_texid (self, texid); 1590 need_texid (self, texid);
1555 1591
1556 { 1592 {
1576 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1614}
1579 1615
1580int 1616int
1581ox (CFPlus::Map self) 1617ox (DC::Map self)
1582 ALIAS: 1618 ALIAS:
1583 oy = 1 1619 oy = 1
1584 x = 2 1620 x = 2
1585 y = 3 1621 y = 3
1586 w = 4 1622 w = 4
1597 } 1633 }
1598 OUTPUT: 1634 OUTPUT:
1599 RETVAL 1635 RETVAL
1600 1636
1601void 1637void
1602scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1603 CODE: 1639 CODE:
1604{ 1640{
1605 if (dx > 0) 1641 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1643 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1624 } 1660 }
1625} 1661}
1626 1662
1627SV * 1663SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1665 CODE:
1630{ 1666{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1669 mapcell *cell;
1661 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1662 1698
1663 do 1699 do
1664 { 1700 {
1665 ext = *data++; 1701 ext = *data++;
1666 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1667 1703
1668 if (cmd < 4) 1704 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1671 { 1707 {
1674 } 1710 }
1675 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1678 { 1714 {
1679 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1719
1682 data += *data + 1; 1720 data += *data + 1;
1683 } 1721 }
1684 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1723 cell->flags = *data++;
1722} 1760}
1723 OUTPUT: 1761 OUTPUT:
1724 RETVAL 1762 RETVAL
1725 1763
1726SV * 1764SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1766 CODE:
1729{ 1767{
1730 int x1, x; 1768 int x1, x;
1731 int y1, y; 1769 int y1, y;
1732 int z; 1770 int z;
1777} 1815}
1778 OUTPUT: 1816 OUTPUT:
1779 RETVAL 1817 RETVAL
1780 1818
1781void 1819void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1783 CODE: 1821 CODE:
1784{ 1822{
1785 int x, y, z; 1823 int x, y, z;
1786 1824
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 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) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1828 smooth_key skey;
1791 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1832 rc_key_t key;
1794 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1795 1836
1796 // thats current max. sorry. 1837 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1799 1840
1854 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1855 1896
1856 if (tile) 1897 if (tile)
1857 { 1898 {
1858 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1859 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1860 1902
1861 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1862 { 1904 {
1863 if (!tex.name) 1905 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1865 1907
1866 key.texname = tex.name; 1908 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1868 } 1910 }
1869 1911
1870 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1872 1919
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 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); 1922 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); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 1924
1878 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 1926 {
1880 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 1928 if (cell->flags & 1)
1882 { 1929 {
1883 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
2022 } 2069 }
2023 2070
2024 hv_clear (smooth); 2071 hv_clear (smooth);
2025 } 2072 }
2026 2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2089 }
2090
2027 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2028 rc_free (rc); 2092 rc_free (rc);
2029 2093
2030 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
2058 } 2122 }
2059 } 2123 }
2060} 2124}
2061 2125
2062void 2126void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064 CODE: 2128 CODE:
2065{ 2129{
2066 static float color[16][3] = { 2130 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2120} 2184}
2121 2185
2122void 2186void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2188 PPCODE:
2125{ 2189{
2126 int x, y; 2190 int x, y;
2127 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2201} 2265}
2202 2266
2203SV * 2267SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2269 CODE:
2206{ 2270{
2207 int x, y, x1, y1; 2271 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2330 else
2267 *data++ = 0; 2331 *data++ = 0;
2268 } 2332 }
2269 } 2333 }
2270 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2271 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2273 RETVAL = data_sv; 2342 RETVAL = data_sv;
2274} 2343}
2275 OUTPUT: 2344 OUTPUT:
2276 RETVAL 2345 RETVAL
2277 2346
2278void 2347void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2349 PPCODE:
2281{ 2350{
2282 int x, y, z; 2351 int x, y, z;
2283 int w, h; 2352 int w, h;
2284 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2285 2364
2286 if (*data++ != 0) 2365 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2288 2367
2289 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2304 { 2383 {
2305 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2306 2385
2307 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2308 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2309 uint8_t flags = *data++; 2393 flags = *data++;
2310 2394
2311 if (flags) 2395 if (flags)
2312 { 2396 {
2313 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2403
2320 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2321 { 2405 {
2322 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2323 2408
2324 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2325 { 2410 {
2326 tileid t = tile [z]; 2411 tileid t = tile [z];
2327 2412
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2414 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2416 need_texid (self, t);
2332 } 2417 }
2333 2418
2334 cell->tile [z] = t; 2419 cell->tile [z] = t;
2335 } 2420 }
2337 } 2422 }
2338 } 2423 }
2339 } 2424 }
2340} 2425}
2341 2426
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2428
2344CFPlus::RW 2429DC::RW
2345new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2346 CODE: 2431 CODE:
2347{ 2432{
2348 STRLEN datalen; 2433 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2437}
2353 OUTPUT: 2438 OUTPUT:
2354 RETVAL 2439 RETVAL
2355 2440
2356CFPlus::RW 2441DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2443 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2445 OUTPUT:
2361 RETVAL 2446 RETVAL
2362 2447
2363# fails on win32: 2448# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2450#void
2366#close (CFPlus::RW self) 2451#close (DC::RW self)
2367# CODE: 2452# CODE:
2368# (self->(close)) (self); 2453# (self->(close)) (self);
2369 2454
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2456
2372PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2373 2458
2374CFPlus::Channel 2459DC::Channel
2375find () 2460find ()
2376 CODE: 2461 CODE:
2377{ 2462{
2378 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2379 2464
2392} 2477}
2393 OUTPUT: 2478 OUTPUT:
2394 RETVAL 2479 RETVAL
2395 2480
2396void 2481void
2397halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2398 CODE: 2483 CODE:
2399 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2400 2485
2401void 2486void
2402expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2403 CODE: 2488 CODE:
2404 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2405 2490
2406void 2491void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2493 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2410 2495
2411int 2496int
2412volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2413 CODE: 2498 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2500 OUTPUT:
2416 RETVAL 2501 RETVAL
2417 2502
2418void 2503void
2419unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2420 CODE: 2505 CODE:
2421 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2422 2507
2423void 2508void
2424set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2425 CODE: 2510 CODE:
2426 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2429 2514
2430void 2515void
2431set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2432 CODE: 2517 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2519
2435void 2520void
2436set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2522 CODE:
2438 2523
2439void 2524void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2526 CODE:
2442{ 2527{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2528 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); 2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2531}
2447 2532
2448void 2533void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2535 CODE:
2451 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2452 2537
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2539
2455PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2456 2541
2457CFPlus::MixChunk 2542DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2459 CODE: 2544 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2546 OUTPUT:
2462 RETVAL 2547 RETVAL
2463 2548
2464void 2549void
2465DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2466 CODE: 2551 CODE:
2467 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2468 2553
2469int 2554int
2470volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2556 CODE:
2472 if (items > 1) 2557 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2560 OUTPUT:
2476 RETVAL 2561 RETVAL
2477 2562
2478CFPlus::Channel 2563DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2565 CODE:
2481{ 2566{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2568
2484 if (RETVAL < 0) 2569 if (RETVAL < 0)
2491 } 2576 }
2492} 2577}
2493 OUTPUT: 2578 OUTPUT:
2494 RETVAL 2579 RETVAL
2495 2580
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2582
2498int 2583int
2499volume (int volume = -1) 2584volume (int volume = -1)
2500 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2501 CODE: 2586 CODE:
2513void 2598void
2514halt () 2599halt ()
2515 CODE: 2600 CODE:
2516 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2517 2602
2518CFPlus::MixMusic 2603DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2520 CODE: 2605 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2607 OUTPUT:
2523 RETVAL 2608 RETVAL
2524 2609
2525void 2610void
2526DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2527 CODE: 2612 CODE:
2528 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2529 2614
2530int 2615int
2531play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2532 CODE: 2617 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2619 OUTPUT:
2535 RETVAL 2620 RETVAL
2536 2621
2537void 2622void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2624 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2626
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2628
2544PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2545 2630
2546BOOT: 2631BOOT:
2547{ 2632{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2634 static const struct {
2550 const char *name; 2635 const char *name;
2551 IV iv; 2636 IV iv;
2552 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2638# 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) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2932 CODE:
2848 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2935
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2937
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2939
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2941
2882 2967
2883void glEndList () 2968void glEndList ()
2884 2969
2885void glCallList (int list) 2970void glCallList (int list)
2886 2971
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 2973
2889PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2890 2975
2891void 2976void
2892find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 2981 XPUSHs (self);
2897} 2982}
2898 2983
2899BOOT: 2984BOOT:
2900{ 2985{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 2987
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2988 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); 2989 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); 2990 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); 2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 2992}
2908 2993
2909void 2994void
2910draw (SV *self) 2995draw (SV *self)
2911 CODE: 2996 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3005 double draw_x, draw_y;
2921 3006
2922 if (!SvROK (self)) 3007 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3009
2925 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2926 3011
2927 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3014
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3015 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.; 3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3017
2933 if (!h || !w) 3018 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines