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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.252 by root, Fri Dec 28 17:30:33 2007 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
57
51#ifndef _WIN32 58#ifndef _WIN32
52# include <sys/types.h> 59# include <sys/types.h>
53# include <sys/socket.h> 60# include <sys/socket.h>
54# include <netinet/in.h> 61# include <netinet/in.h>
55# include <netinet/tcp.h> 62# include <netinet/tcp.h>
120 127
121#include "pango-font.c" 128#include "pango-font.c"
122#include "pango-fontmap.c" 129#include "pango-fontmap.c"
123#include "pango-render.c" 130#include "pango-render.c"
124 131
125typedef IV CFPlus__Channel; 132typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 133typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 134typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 135typedef Mix_Music *DC__MixMusic;
129 136
130typedef PangoFontDescription *CFPlus__Font; 137typedef PangoFontDescription *DC__Font;
131 138
132static int 139static int
133shape_attr_p (PangoLayoutRun *run) 140shape_attr_p (PangoLayoutRun *run)
134{ 141{
135 GSList *attrs = run->item->analysis.extra_attrs; 142 GSList *attrs = run->item->analysis.extra_attrs;
149 156
150typedef struct cf_layout { 157typedef struct cf_layout {
151 PangoLayout *pl; 158 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 159 float r, g, b, a; // default color for rgba mode
153 int base_height; 160 int base_height;
154 CFPlus__Font font; 161 DC__Font font;
155 rc_t *rc; 162 rc_t *rc;
156} *CFPlus__Layout; 163} *DC__Layout;
157 164
158static CFPlus__Font default_font; 165static DC__Font default_font;
159static PangoContext *opengl_context; 166static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 167static PangoFontMap *opengl_fontmap;
161 168
162static void 169static void
163substitute_func (FcPattern *pattern, gpointer data) 170substitute_func (FcPattern *pattern, gpointer data)
168#endif 175#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 176 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 177}
171 178
172static void 179static void
173layout_update_font (CFPlus__Layout self) 180layout_update_font (DC__Layout self)
174{ 181{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 182 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 183 * reasonably well with bitstream vera
177 */ 184 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 185 PangoFontDescription *font = self->font ? self->font : default_font;
182 189
183 pango_layout_set_font_description (self->pl, font); 190 pango_layout_set_font_description (self->pl, font);
184} 191}
185 192
186static void 193static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 194layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 195{
189 PangoRectangle rect; 196 PangoRectangle rect;
190 197
191 // get_pixel_* wrongly rounds down 198 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 199 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 238 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 239 int texs; maptex *tex; // [tileid]
233 240
234 int32_t rows; 241 int32_t rows;
235 maprow *row; 242 maprow *row;
236} *CFPlus__Map; 243} *DC__Map;
237 244
238static char * 245static char *
239prepend (char *ptr, int sze, int inc) 246prepend (char *ptr, int sze, int inc)
240{ 247{
241 char *p; 248 char *p;
279 self->texs *= 2; 286 self->texs *= 2;
280 } 287 }
281} 288}
282 289
283static maprow * 290static maprow *
284map_get_row (CFPlus__Map self, int y) 291map_get_row (DC__Map self, int y)
285{ 292{
286 if (0 > y) 293 if (0 > y)
287 { 294 {
288 int extend = - y + MAP_EXTEND_Y; 295 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 296 Prepend (maprow, self->row, self->rows, extend);
327 334
328 return row->col + (x - row->c0); 335 return row->col + (x - row->c0);
329} 336}
330 337
331static mapcell * 338static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 339map_get_cell (DC__Map self, int x, int y)
333{ 340{
334 return row_get_cell (map_get_row (self, y), x); 341 return row_get_cell (map_get_row (self, y), x);
335} 342}
336 343
337static void 344static void
338map_clear (CFPlus__Map self) 345map_clear (DC__Map self)
339{ 346{
340 int r; 347 int r;
341 348
342 for (r = 0; r < self->rows; r++) 349 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 350 Safefree (self->row[r].col);
351 self->row = 0; 358 self->row = 0;
352 self->rows = 0; 359 self->rows = 0;
353} 360}
354 361
355static void 362static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 363map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 364{
358 int x, y; 365 int x, y;
359 maprow *row; 366 maprow *row;
360 mapcell *cell; 367 mapcell *cell;
361 368
498 return 0; 505 return 0;
499 506
500 return 1; 507 return 1;
501} 508}
502 509
503MODULE = CFPlus PACKAGE = CFPlus 510MODULE = Deliantra::Client PACKAGE = DC
504 511
505PROTOTYPES: ENABLE 512PROTOTYPES: ENABLE
506 513
507BOOT: 514BOOT:
508{ 515{
509 HV *stash = gv_stashpv ("CFPlus", 1); 516 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 517 static const struct {
511 const char *name; 518 const char *name;
512 IV iv; 519 IV iv;
513 } *civ, const_iv[] = { 520 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 521# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 626 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 627 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 628 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 629 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 630 const_iv (KMOD_MODE),
631
632 const_iv (MIX_DEFAULT_FORMAT),
624# undef const_iv 633# undef const_iv
625 }; 634 };
626 635
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
657 CODE: 666 CODE:
658{ 667{
659 opengl_fontmap = pango_opengl_font_map_new (); 668 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif
662} 675}
663 676
664char * 677char *
665SDL_GetError () 678SDL_GetError ()
666 679
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 712
700 if (m && m != (SDL_Rect **)-1) 713 if (m && m != (SDL_Rect **)-1)
701 while (*m) 714 while (*m)
702 { 715 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 716 if ((*m)->w >= 800 && (*m)->h >= 480)
704 { 717 {
705 AV *av = newAV (); 718 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 719 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 720 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 721 av_push (av, newSViv (rgb));
732 745
733 if (RETVAL) 746 if (RETVAL)
734 { 747 {
735 av_clear (texture_av); 748 av_clear (texture_av);
736 749
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 752#include "glfunc.h"
740#undef GL_FUNC 753#undef GL_FUNC
741 } 754 }
742} 755}
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 836 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 837 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 838 break;
826 } 839 }
827 840
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 842 }
830} 843}
831 844
832int 845int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 847 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 848 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 849 Mix_ChannelFinished (channel_finished);
850
851void
852Mix_QuerySpec ()
853 PPCODE:
854{
855 int freq, channels;
856 Uint16 format;
857
858 if (Mix_QuerySpec (&freq, &format, &channels))
859 {
860 EXTEND (SP, 3);
861 PUSHs (sv_2mortal (newSViv (freq)));
862 PUSHs (sv_2mortal (newSViv (format)));
863 PUSHs (sv_2mortal (newSViv (channels)));
864 }
865}
837 866
838void 867void
839Mix_CloseAudio () 868Mix_CloseAudio ()
840 869
841int 870int
975void 1004void
976error (char *message) 1005error (char *message)
977 CODE: 1006 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1007 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1008#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1009 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1010#endif
982 1011
983void 1012void
984fatal (char *message) 1013fatal (char *message)
985 CODE: 1014 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1015 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1016#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1017 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1018#endif
990 _exit (1); 1019 _exit (1);
991 1020
992void 1021void
993_exit (int retval = 0) 1022_exit (int retval = 0)
1005#if DEBUG 1034#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1035 VALGRIND_DO_LEAK_CHECK;
1007#endif 1036#endif
1008} 1037}
1009 1038
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1039MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1040
1012PROTOTYPES: DISABLE 1041PROTOTYPES: DISABLE
1013 1042
1014CFPlus::Font 1043DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1044new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1045 CODE:
1017{ 1046{
1018 int count; 1047 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1051}
1023 OUTPUT: 1052 OUTPUT:
1024 RETVAL 1053 RETVAL
1025 1054
1026void 1055void
1027DESTROY (CFPlus::Font self) 1056DESTROY (DC::Font self)
1028 CODE: 1057 CODE:
1029 pango_font_description_free (self); 1058 pango_font_description_free (self);
1030 1059
1031void 1060void
1032make_default (CFPlus::Font self) 1061make_default (DC::Font self)
1033 PROTOTYPE: $ 1062 PROTOTYPE: $
1034 CODE: 1063 CODE:
1035 default_font = self; 1064 default_font = self;
1036 1065
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1066MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1067
1039PROTOTYPES: DISABLE 1068PROTOTYPES: DISABLE
1040 1069
1041void 1070void
1042reset_glyph_cache () 1071glyph_cache_backup ()
1043 PROTOTYPE: 1072 PROTOTYPE:
1044 CODE: 1073 CODE:
1074 tc_backup ();
1075
1076void
1077glyph_cache_restore ()
1078 PROTOTYPE:
1079 CODE:
1045 tc_clear (); 1080 tc_restore ();
1046 1081
1047CFPlus::Layout 1082DC::Layout
1048new (SV *class) 1083new (SV *class)
1049 CODE: 1084 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1085 New (0, RETVAL, 1, struct cf_layout);
1051 1086
1052 RETVAL->pl = pango_layout_new (opengl_context); 1087 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1097 layout_update_font (RETVAL);
1063 OUTPUT: 1098 OUTPUT:
1064 RETVAL 1099 RETVAL
1065 1100
1066void 1101void
1067DESTROY (CFPlus::Layout self) 1102DESTROY (DC::Layout self)
1068 CODE: 1103 CODE:
1069 g_object_unref (self->pl); 1104 g_object_unref (self->pl);
1070 rc_free (self->rc); 1105 rc_free (self->rc);
1071 Safefree (self); 1106 Safefree (self);
1072 1107
1073void 1108void
1074set_text (CFPlus::Layout self, SV *text_) 1109set_text (DC::Layout self, SV *text_)
1075 CODE: 1110 CODE:
1076{ 1111{
1077 STRLEN textlen; 1112 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1113 char *text = SvPVutf8 (text_, textlen);
1079 1114
1080 pango_layout_set_text (self->pl, text, textlen); 1115 pango_layout_set_text (self->pl, text, textlen);
1081} 1116}
1082 1117
1083void 1118void
1084set_markup (CFPlus::Layout self, SV *text_) 1119set_markup (DC::Layout self, SV *text_)
1085 CODE: 1120 CODE:
1086{ 1121{
1087 STRLEN textlen; 1122 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1089 1124
1090 pango_layout_set_markup (self->pl, text, textlen); 1125 pango_layout_set_markup (self->pl, text, textlen);
1091} 1126}
1092 1127
1093void 1128void
1094set_shapes (CFPlus::Layout self, ...) 1129set_shapes (DC::Layout self, ...)
1095 CODE: 1130 CODE:
1096{ 1131{
1097 PangoAttrList *attrs = 0; 1132 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1133 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1134 const char *pos = text;
1134 if (attrs) 1169 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1170 pango_layout_set_attributes (self->pl, attrs);
1136} 1171}
1137 1172
1138void 1173void
1139get_shapes (CFPlus::Layout self) 1174get_shapes (DC::Layout self)
1140 PPCODE: 1175 PPCODE:
1141{ 1176{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1177 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1178
1144 do 1179 do
1145 { 1180 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1181 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1182
1148 if (run && shape_attr_p (run)) 1183 if (run && shape_attr_p (run))
1149 { 1184 {
1150 PangoRectangle extents; 1185 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1186 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1194
1160 pango_layout_iter_free (iter); 1195 pango_layout_iter_free (iter);
1161} 1196}
1162 1197
1163int 1198int
1164has_wrapped (CFPlus::Layout self) 1199has_wrapped (DC::Layout self)
1165 CODE: 1200 CODE:
1166{ 1201{
1167 int lines = 1; 1202 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1203 const char *text = pango_layout_get_text (self->pl);
1169 1204
1174} 1209}
1175 OUTPUT: 1210 OUTPUT:
1176 RETVAL 1211 RETVAL
1177 1212
1178SV * 1213SV *
1179get_text (CFPlus::Layout self) 1214get_text (DC::Layout self)
1180 CODE: 1215 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1216 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1217 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1218 OUTPUT:
1184 RETVAL 1219 RETVAL
1185 1220
1186void 1221void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1222set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1223 CODE:
1189 self->r = r; 1224 self->r = r;
1190 self->g = g; 1225 self->g = g;
1191 self->b = b; 1226 self->b = b;
1192 self->a = a; 1227 self->a = a;
1193 1228
1194void 1229void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1230set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1231 CODE:
1197 if (self->font != font) 1232 if (self->font != font)
1198 { 1233 {
1199 self->font = font; 1234 self->font = font;
1200 layout_update_font (self); 1235 layout_update_font (self);
1201 } 1236 }
1202 1237
1203void 1238void
1204set_height (CFPlus::Layout self, int base_height) 1239set_height (DC::Layout self, int base_height)
1205 CODE: 1240 CODE:
1206 if (self->base_height != base_height) 1241 if (self->base_height != base_height)
1207 { 1242 {
1208 self->base_height = base_height; 1243 self->base_height = base_height;
1209 layout_update_font (self); 1244 layout_update_font (self);
1210 } 1245 }
1211 1246
1212void 1247void
1213set_width (CFPlus::Layout self, int max_width = -1) 1248set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1249 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1250 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1251
1217void 1252void
1218set_indent (CFPlus::Layout self, int indent) 1253set_indent (DC::Layout self, int indent)
1219 CODE: 1254 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1255 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1256
1222void 1257void
1223set_spacing (CFPlus::Layout self, int spacing) 1258set_spacing (DC::Layout self, int spacing)
1224 CODE: 1259 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1260 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1261
1227void 1262void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1263set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1264 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1265 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1266 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1267 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1268 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1269 : PANGO_ELLIPSIZE_NONE
1235 ); 1270 );
1236 1271
1237void 1272void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1273set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1274 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1275 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1276
1242void 1277void
1243size (CFPlus::Layout self) 1278size (DC::Layout self)
1244 PPCODE: 1279 PPCODE:
1245{ 1280{
1246 int w, h; 1281 int w, h;
1247 1282
1248 layout_get_pixel_size (self, &w, &h); 1283 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1286 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1287 PUSHs (sv_2mortal (newSViv (h)));
1253} 1288}
1254 1289
1255int 1290int
1256descent (CFPlus::Layout self) 1291descent (DC::Layout self)
1257 CODE: 1292 CODE:
1258{ 1293{
1259 PangoRectangle rect; 1294 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1295 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1296 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1297 RETVAL = PANGO_DESCENT (rect);
1263} 1298}
1264 OUTPUT: 1299 OUTPUT:
1265 RETVAL 1300 RETVAL
1266 1301
1267int 1302int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1303xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1304 CODE:
1270{ 1305{
1271 int index, trailing; 1306 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1307 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1308 RETVAL = index + trailing;
1274} 1309}
1275 OUTPUT: 1310 OUTPUT:
1276 RETVAL 1311 RETVAL
1277 1312
1278void 1313void
1279cursor_pos (CFPlus::Layout self, int index) 1314cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1315 PPCODE:
1281{ 1316{
1282 PangoRectangle strong_pos; 1317 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1318 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1319
1285 EXTEND (SP, 3); 1320 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1324}
1290 1325
1291void 1326void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1327index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1328 PPCODE:
1294{ 1329{
1295 int line, x; 1330 int line, x;
1296 1331
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1335 --line;
1336#endif
1300 EXTEND (SP, 2); 1337 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1338 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1339 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1340}
1304 1341
1305void 1342void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1343line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1344 PPCODE:
1308{ 1345{
1309 PangoLayoutLine *lp; 1346 PangoLayoutLine *lp;
1310 int index, trailing; 1347 int index, trailing;
1311 1348
1312 if (line < 0) 1349 if (line < 0)
1313 XSRETURN_EMPTY; 1350 XSRETURN_EMPTY;
1314 1351
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1352 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1353 XSRETURN_EMPTY; /* do better */
1317 1354
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1355 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1356
1320 EXTEND (SP, 2); 1357 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1363 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1364 }
1328} 1365}
1329 1366
1330void 1367void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1368render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1369 CODE:
1333 rc_clear (self->rc); 1370 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1371 pango_opengl_render_layout_subpixel (
1335 self->pl, 1372 self->pl,
1336 self->rc, 1373 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1378 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1379 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1380 pango_layout_context_changed (self->pl);
1344 1381
1345void 1382void
1346draw (CFPlus::Layout self) 1383draw (DC::Layout self)
1347 CODE: 1384 CODE:
1348{ 1385{
1349 glEnable (GL_TEXTURE_2D); 1386 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1387 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1388 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1396 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1397 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1398 glDisable (GL_TEXTURE_2D);
1362} 1399}
1363 1400
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1401MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1402
1366PROTOTYPES: ENABLE 1403PROTOTYPES: ENABLE
1367 1404
1368void 1405void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1406pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1485 RETVAL = width > 0;
1449} 1486}
1450 OUTPUT: 1487 OUTPUT:
1451 RETVAL 1488 RETVAL
1452 1489
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1490MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1491
1455PROTOTYPES: DISABLE 1492PROTOTYPES: DISABLE
1456 1493
1457CFPlus::Map 1494DC::Map
1458new (SV *class) 1495new (SV *class)
1459 CODE: 1496 CODE:
1460 New (0, RETVAL, 1, struct map); 1497 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1498 RETVAL->x = 0;
1462 RETVAL->y = 0; 1499 RETVAL->y = 0;
1470 RETVAL->row = 0; 1507 RETVAL->row = 0;
1471 OUTPUT: 1508 OUTPUT:
1472 RETVAL 1509 RETVAL
1473 1510
1474void 1511void
1475DESTROY (CFPlus::Map self) 1512DESTROY (DC::Map self)
1476 CODE: 1513 CODE:
1477{ 1514{
1478 map_clear (self); 1515 map_clear (self);
1479 Safefree (self->face2tile); 1516 Safefree (self->face2tile);
1480 Safefree (self->tex); 1517 Safefree (self->tex);
1481 Safefree (self); 1518 Safefree (self);
1482} 1519}
1483 1520
1484void 1521void
1485resize (CFPlus::Map self, int map_width, int map_height) 1522resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1523 CODE:
1487 self->w = map_width; 1524 self->w = map_width;
1488 self->h = map_height; 1525 self->h = map_height;
1489 1526
1490void 1527void
1491clear (CFPlus::Map self) 1528clear (DC::Map self)
1492 CODE: 1529 CODE:
1493 map_clear (self); 1530 map_clear (self);
1494 1531
1495void 1532void
1496set_tileid (CFPlus::Map self, int face, int tile) 1533set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1534 CODE:
1498{ 1535{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1536 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1537 need_texid (self, tile);
1501} 1538}
1502 1539
1503void 1540void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1541set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1542 CODE:
1506{ 1543{
1507 tileid texid; 1544 tileid texid;
1508 maptex *tex; 1545 maptex *tex;
1509 1546
1522 tex->smoothtile = self->face2tile [smooth]; 1559 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1560 tex->smoothlevel = level;
1524} 1561}
1525 1562
1526void 1563void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1564set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1565 CODE:
1529{ 1566{
1530 need_texid (self, texid); 1567 need_texid (self, texid);
1531 1568
1532 { 1569 {
1552 // from transparent color bleeding and ugly wrapping effects. 1589 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1591}
1555 1592
1556int 1593int
1557ox (CFPlus::Map self) 1594ox (DC::Map self)
1558 ALIAS: 1595 ALIAS:
1559 oy = 1 1596 oy = 1
1560 x = 2 1597 x = 2
1561 y = 3 1598 y = 3
1562 w = 4 1599 w = 4
1573 } 1610 }
1574 OUTPUT: 1611 OUTPUT:
1575 RETVAL 1612 RETVAL
1576 1613
1577void 1614void
1578scroll (CFPlus::Map self, int dx, int dy) 1615scroll (DC::Map self, int dx, int dy)
1579 CODE: 1616 CODE:
1580{ 1617{
1581 if (dx > 0) 1618 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1619 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1620 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1636 self->y += MAP_EXTEND_Y;
1600 } 1637 }
1601} 1638}
1602 1639
1603SV * 1640SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1641map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1642 CODE:
1606{ 1643{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1645 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1646 mapcell *cell;
1698} 1735}
1699 OUTPUT: 1736 OUTPUT:
1700 RETVAL 1737 RETVAL
1701 1738
1702SV * 1739SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1740mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1741 CODE:
1705{ 1742{
1706 int x1, x; 1743 int x1, x;
1707 int y1, y; 1744 int y1, y;
1708 int z; 1745 int z;
1753} 1790}
1754 OUTPUT: 1791 OUTPUT:
1755 RETVAL 1792 RETVAL
1756 1793
1757void 1794void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1795draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1759 CODE: 1796 CODE:
1760{ 1797{
1761 int x, y, z; 1798 int x, y, z;
1762 1799
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2034 } 2071 }
2035 } 2072 }
2036} 2073}
2037 2074
2038void 2075void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2077 CODE:
2041{ 2078{
2042 static float color[16][3] = { 2079 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2080 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2081 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2131 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2132 glDisable (GL_TEXTURE_2D);
2096} 2133}
2097 2134
2098void 2135void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2136fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2137 PPCODE:
2101{ 2138{
2102 int x, y; 2139 int x, y;
2103 int sw1 = sw + 2; 2140 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2141 int sh1 = sh + 2;
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2212 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2213 PUSHs (darkness3_sv);
2177} 2214}
2178 2215
2179SV * 2216SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2217get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2218 CODE:
2182{ 2219{
2183 int x, y, x1, y1; 2220 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2221 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2222 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2250} 2287}
2251 OUTPUT: 2288 OUTPUT:
2252 RETVAL 2289 RETVAL
2253 2290
2254void 2291void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2292set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2256 PPCODE: 2293 PPCODE:
2257{ 2294{
2258 int x, y, z; 2295 int x, y, z;
2259 int w, h; 2296 int w, h;
2260 int x1, y1; 2297 int x1, y1;
2313 } 2350 }
2314 } 2351 }
2315 } 2352 }
2316} 2353}
2317 2354
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2355MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2356
2320CFPlus::RW 2357DC::RW
2321new (SV *class, SV *data_sv) 2358new (SV *class, SV *data_sv)
2322 CODE: 2359 CODE:
2323{ 2360{
2324 STRLEN datalen; 2361 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2362 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2364 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2365}
2329 OUTPUT: 2366 OUTPUT:
2330 RETVAL 2367 RETVAL
2331 2368
2332CFPlus::RW 2369DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2370new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2371 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2372 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2373 OUTPUT:
2337 RETVAL 2374 RETVAL
2338 2375
2339# fails on win32: 2376# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2377# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2378#void
2342#close (CFPlus::RW self) 2379#close (DC::RW self)
2343# CODE: 2380# CODE:
2344# (self->(close)) (self); 2381# (self->(close)) (self);
2345 2382
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2383MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2384
2348PROTOTYPES: DISABLE 2385PROTOTYPES: DISABLE
2349 2386
2350CFPlus::Channel 2387DC::Channel
2351find () 2388find ()
2352 CODE: 2389 CODE:
2353{ 2390{
2354 RETVAL = Mix_GroupAvailable (-1); 2391 RETVAL = Mix_GroupAvailable (-1);
2355 2392
2368} 2405}
2369 OUTPUT: 2406 OUTPUT:
2370 RETVAL 2407 RETVAL
2371 2408
2372void 2409void
2373halt (CFPlus::Channel self) 2410halt (DC::Channel self)
2374 CODE: 2411 CODE:
2375 Mix_HaltChannel (self); 2412 Mix_HaltChannel (self);
2376 2413
2377void 2414void
2378expire (CFPlus::Channel self, int ticks = -1) 2415expire (DC::Channel self, int ticks = -1)
2379 CODE: 2416 CODE:
2380 Mix_ExpireChannel (self, ticks); 2417 Mix_ExpireChannel (self, ticks);
2381 2418
2382void 2419void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2420fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2421 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2422 Mix_FadeOutChannel (self, ticks);
2386 2423
2387int 2424int
2388volume (CFPlus::Channel self, int volume) 2425volume (DC::Channel self, int volume)
2389 CODE: 2426 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2427 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2428 OUTPUT:
2392 RETVAL 2429 RETVAL
2393 2430
2394void 2431void
2395unregister_all_effects (CFPlus::Channel self) 2432unregister_all_effects (DC::Channel self)
2396 CODE: 2433 CODE:
2397 Mix_UnregisterAllEffects (self); 2434 Mix_UnregisterAllEffects (self);
2398 2435
2399void 2436void
2400set_panning (CFPlus::Channel self, int left, int right) 2437set_panning (DC::Channel self, int left, int right)
2401 CODE: 2438 CODE:
2402 left = CLAMP (left , 0, 255); 2439 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2440 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2441 Mix_SetPanning (self, left, right);
2405 2442
2406void 2443void
2407set_distance (CFPlus::Channel self, int distance) 2444set_distance (DC::Channel self, int distance)
2408 CODE: 2445 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2446 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2447
2411void 2448void
2412set_position (CFPlus::Channel self, int angle, int distance) 2449set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2450 CODE:
2414 2451
2415void 2452void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2454 CODE:
2418{ 2455{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2459}
2423 2460
2424void 2461void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2462set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2463 CODE:
2427 Mix_SetReverseStereo (self, flip); 2464 Mix_SetReverseStereo (self, flip);
2428 2465
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2467
2431PROTOTYPES: DISABLE 2468PROTOTYPES: DISABLE
2432 2469
2433CFPlus::MixChunk 2470DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2471new (SV *class, DC::RW rwops)
2435 CODE: 2472 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2473 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2474 OUTPUT:
2438 RETVAL 2475 RETVAL
2439 2476
2440void 2477void
2441DESTROY (CFPlus::MixChunk self) 2478DESTROY (DC::MixChunk self)
2442 CODE: 2479 CODE:
2443 Mix_FreeChunk (self); 2480 Mix_FreeChunk (self);
2444 2481
2445int 2482int
2446volume (CFPlus::MixChunk self, int volume = -1) 2483volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2484 CODE:
2448 if (items > 1) 2485 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2486 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2487 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2488 OUTPUT:
2452 RETVAL 2489 RETVAL
2453 2490
2454CFPlus::Channel 2491DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2492play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2493 CODE:
2457{ 2494{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2496
2460 if (RETVAL < 0) 2497 if (RETVAL < 0)
2467 } 2504 }
2468} 2505}
2469 OUTPUT: 2506 OUTPUT:
2470 RETVAL 2507 RETVAL
2471 2508
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2510
2474int 2511int
2475volume (int volume = -1) 2512volume (int volume = -1)
2476 PROTOTYPE: ;$ 2513 PROTOTYPE: ;$
2477 CODE: 2514 CODE:
2489void 2526void
2490halt () 2527halt ()
2491 CODE: 2528 CODE:
2492 Mix_HaltMusic (); 2529 Mix_HaltMusic ();
2493 2530
2494CFPlus::MixMusic 2531DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2532new (SV *class, DC::RW rwops)
2496 CODE: 2533 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2534 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2535 OUTPUT:
2499 RETVAL 2536 RETVAL
2500 2537
2501void 2538void
2502DESTROY (CFPlus::MixMusic self) 2539DESTROY (DC::MixMusic self)
2503 CODE: 2540 CODE:
2504 Mix_FreeMusic (self); 2541 Mix_FreeMusic (self);
2505 2542
2506int 2543int
2507play (CFPlus::MixMusic self, int loops = -1) 2544play (DC::MixMusic self, int loops = -1)
2508 CODE: 2545 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2546 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2547 OUTPUT:
2511 RETVAL 2548 RETVAL
2512 2549
2513void 2550void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2551fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2552 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2553 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2554
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2555MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2556
2520PROTOTYPES: ENABLE 2557PROTOTYPES: ENABLE
2521 2558
2522BOOT: 2559BOOT:
2523{ 2560{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2561 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2562 static const struct {
2526 const char *name; 2563 const char *name;
2527 IV iv; 2564 IV iv;
2528 } *civ, const_iv[] = { 2565 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2566# define const_iv(name) { # name, (IV)name }
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2859void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 2860 CODE:
2824 if (gl.SeparableFilter2D) 2861 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2862 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2863
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2864void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 2865
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2866void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 2867
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2868void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2869
2858 2895
2859void glEndList () 2896void glEndList ()
2860 2897
2861void glCallList (int list) 2898void glCallList (int list)
2862 2899
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 2901
2865PROTOTYPES: DISABLE 2902PROTOTYPES: DISABLE
2866 2903
2867void 2904void
2868find_widget (SV *self, NV x, NV y) 2905find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 2909 XPUSHs (self);
2873} 2910}
2874 2911
2875BOOT: 2912BOOT:
2876{ 2913{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2914 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 2915
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2916 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2917 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2918 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2919 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 2920}
2884 2921
2885void 2922void
2886draw (SV *self) 2923draw (SV *self)
2887 CODE: 2924 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 2931 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 2932 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 2933 double draw_x, draw_y;
2897 2934
2898 if (!SvROK (self)) 2935 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2936 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 2937
2901 hv = (HV *)SvRV (self); 2938 hv = (HV *)SvRV (self);
2902 2939
2903 if (SvTYPE (hv) != SVt_PVHV) 2940 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2941 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 2942
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2943 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2944 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 2945
2909 if (!h || !w) 2946 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines