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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines