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.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.246 by root, Fri Dec 28 15:06:02 2007 UTC

120 120
121#include "pango-font.c" 121#include "pango-font.c"
122#include "pango-fontmap.c" 122#include "pango-fontmap.c"
123#include "pango-render.c" 123#include "pango-render.c"
124 124
125typedef IV CFPlus__Channel; 125typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 126typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *DC__MixMusic;
129 129
130typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *DC__Font;
131 131
132static int 132static int
133shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
134{ 134{
135 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
149 149
150typedef struct cf_layout { 150typedef struct cf_layout {
151 PangoLayout *pl; 151 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
153 int base_height; 153 int base_height;
154 CFPlus__Font font; 154 DC__Font font;
155 rc_t *rc; 155 rc_t *rc;
156} *CFPlus__Layout; 156} *DC__Layout;
157 157
158static CFPlus__Font default_font; 158static DC__Font default_font;
159static PangoContext *opengl_context; 159static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
161 161
162static void 162static void
163substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
168#endif 168#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 170}
171 171
172static void 172static void
173layout_update_font (CFPlus__Layout self) 173layout_update_font (DC__Layout self)
174{ 174{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 175 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
177 */ 177 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
182 182
183 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
184} 184}
185 185
186static void 186static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 188{
189 PangoRectangle rect; 189 PangoRectangle rect;
190 190
191 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 231 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 232 int texs; maptex *tex; // [tileid]
233 233
234 int32_t rows; 234 int32_t rows;
235 maprow *row; 235 maprow *row;
236} *CFPlus__Map; 236} *DC__Map;
237 237
238static char * 238static char *
239prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
240{ 240{
241 char *p; 241 char *p;
279 self->texs *= 2; 279 self->texs *= 2;
280 } 280 }
281} 281}
282 282
283static maprow * 283static maprow *
284map_get_row (CFPlus__Map self, int y) 284map_get_row (DC__Map self, int y)
285{ 285{
286 if (0 > y) 286 if (0 > y)
287 { 287 {
288 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
327 327
328 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
329} 329}
330 330
331static mapcell * 331static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (DC__Map self, int x, int y)
333{ 333{
334 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
335} 335}
336 336
337static void 337static void
338map_clear (CFPlus__Map self) 338map_clear (DC__Map self)
339{ 339{
340 int r; 340 int r;
341 341
342 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
351 self->row = 0; 351 self->row = 0;
352 self->rows = 0; 352 self->rows = 0;
353} 353}
354 354
355static void 355static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 356map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 357{
358 int x, y; 358 int x, y;
359 maprow *row; 359 maprow *row;
360 mapcell *cell; 360 mapcell *cell;
361 361
498 return 0; 498 return 0;
499 499
500 return 1; 500 return 1;
501} 501}
502 502
503MODULE = CFPlus PACKAGE = CFPlus 503MODULE = Deliantra::Client PACKAGE = DC
504 504
505PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
506 506
507BOOT: 507BOOT:
508{ 508{
509 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 510 static const struct {
511 const char *name; 511 const char *name;
512 IV iv; 512 IV iv;
513 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 701
702 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
703 while (*m) 703 while (*m)
704 { 704 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 705 if ((*m)->w >= 800 && (*m)->h >= 480)
706 { 706 {
707 AV *av = newAV (); 707 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 827 break;
828 } 828 }
829 829
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 831 }
832} 832}
833 833
834int 834int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023#if DEBUG 1023#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1024 VALGRIND_DO_LEAK_CHECK;
1025#endif 1025#endif
1026} 1026}
1027 1027
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1029
1030PROTOTYPES: DISABLE 1030PROTOTYPES: DISABLE
1031 1031
1032CFPlus::Font 1032DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1034 CODE:
1035{ 1035{
1036 int count; 1036 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1040}
1041 OUTPUT: 1041 OUTPUT:
1042 RETVAL 1042 RETVAL
1043 1043
1044void 1044void
1045DESTROY (CFPlus::Font self) 1045DESTROY (DC::Font self)
1046 CODE: 1046 CODE:
1047 pango_font_description_free (self); 1047 pango_font_description_free (self);
1048 1048
1049void 1049void
1050make_default (CFPlus::Font self) 1050make_default (DC::Font self)
1051 PROTOTYPE: $ 1051 PROTOTYPE: $
1052 CODE: 1052 CODE:
1053 default_font = self; 1053 default_font = self;
1054 1054
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1056
1057PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1058 1058
1059void 1059void
1060glyph_cache_backup () 1060glyph_cache_backup ()
1066glyph_cache_restore () 1066glyph_cache_restore ()
1067 PROTOTYPE: 1067 PROTOTYPE:
1068 CODE: 1068 CODE:
1069 tc_restore (); 1069 tc_restore ();
1070 1070
1071CFPlus::Layout 1071DC::Layout
1072new (SV *class) 1072new (SV *class)
1073 CODE: 1073 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
1075 1075
1076 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1087 OUTPUT: 1087 OUTPUT:
1088 RETVAL 1088 RETVAL
1089 1089
1090void 1090void
1091DESTROY (CFPlus::Layout self) 1091DESTROY (DC::Layout self)
1092 CODE: 1092 CODE:
1093 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc); 1094 rc_free (self->rc);
1095 Safefree (self); 1095 Safefree (self);
1096 1096
1097void 1097void
1098set_text (CFPlus::Layout self, SV *text_) 1098set_text (DC::Layout self, SV *text_)
1099 CODE: 1099 CODE:
1100{ 1100{
1101 STRLEN textlen; 1101 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
1103 1103
1104 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
1105} 1105}
1106 1106
1107void 1107void
1108set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (DC::Layout self, SV *text_)
1109 CODE: 1109 CODE:
1110{ 1110{
1111 STRLEN textlen; 1111 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
1113 1113
1114 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
1115} 1115}
1116 1116
1117void 1117void
1118set_shapes (CFPlus::Layout self, ...) 1118set_shapes (DC::Layout self, ...)
1119 CODE: 1119 CODE:
1120{ 1120{
1121 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1123 const char *pos = text;
1158 if (attrs) 1158 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
1160} 1160}
1161 1161
1162void 1162void
1163get_shapes (CFPlus::Layout self) 1163get_shapes (DC::Layout self)
1164 PPCODE: 1164 PPCODE:
1165{ 1165{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1167
1168 do 1168 do
1183 1183
1184 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
1185} 1185}
1186 1186
1187int 1187int
1188has_wrapped (CFPlus::Layout self) 1188has_wrapped (DC::Layout self)
1189 CODE: 1189 CODE:
1190{ 1190{
1191 int lines = 1; 1191 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1193 1193
1198} 1198}
1199 OUTPUT: 1199 OUTPUT:
1200 RETVAL 1200 RETVAL
1201 1201
1202SV * 1202SV *
1203get_text (CFPlus::Layout self) 1203get_text (DC::Layout self)
1204 CODE: 1204 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1207 OUTPUT:
1208 RETVAL 1208 RETVAL
1209 1209
1210void 1210void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1211set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1212 CODE:
1213 self->r = r; 1213 self->r = r;
1214 self->g = g; 1214 self->g = g;
1215 self->b = b; 1215 self->b = b;
1216 self->a = a; 1216 self->a = a;
1217 1217
1218void 1218void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1220 CODE:
1221 if (self->font != font) 1221 if (self->font != font)
1222 { 1222 {
1223 self->font = font; 1223 self->font = font;
1224 layout_update_font (self); 1224 layout_update_font (self);
1225 } 1225 }
1226 1226
1227void 1227void
1228set_height (CFPlus::Layout self, int base_height) 1228set_height (DC::Layout self, int base_height)
1229 CODE: 1229 CODE:
1230 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
1231 { 1231 {
1232 self->base_height = base_height; 1232 self->base_height = base_height;
1233 layout_update_font (self); 1233 layout_update_font (self);
1234 } 1234 }
1235 1235
1236void 1236void
1237set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1238 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1240
1241void 1241void
1242set_indent (CFPlus::Layout self, int indent) 1242set_indent (DC::Layout self, int indent)
1243 CODE: 1243 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1245
1246void 1246void
1247set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (DC::Layout self, int spacing)
1248 CODE: 1248 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1250
1251void 1251void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1253 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1259 ); 1259 );
1260 1260
1261void 1261void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1263 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1265
1266void 1266void
1267size (CFPlus::Layout self) 1267size (DC::Layout self)
1268 PPCODE: 1268 PPCODE:
1269{ 1269{
1270 int w, h; 1270 int w, h;
1271 1271
1272 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1277} 1277}
1278 1278
1279int 1279int
1280descent (CFPlus::Layout self) 1280descent (DC::Layout self)
1281 CODE: 1281 CODE:
1282{ 1282{
1283 PangoRectangle rect; 1283 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
1287} 1287}
1288 OUTPUT: 1288 OUTPUT:
1289 RETVAL 1289 RETVAL
1290 1290
1291int 1291int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1293 CODE:
1294{ 1294{
1295 int index, trailing; 1295 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1297 RETVAL = index + trailing;
1298} 1298}
1299 OUTPUT: 1299 OUTPUT:
1300 RETVAL 1300 RETVAL
1301 1301
1302void 1302void
1303cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1304 PPCODE:
1305{ 1305{
1306 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1308 1308
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1313} 1313}
1314 1314
1315void 1315void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1316index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1317 PPCODE:
1318{ 1318{
1319 int line, x; 1319 int line, x;
1320 1320
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322#if !PANGO_VERSION_CHECK (1, 17. 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1324 --line;
1325#endif
1324 EXTEND (SP, 2); 1326 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1327 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1328 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1329}
1328 1330
1329void 1331void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1332line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1333 PPCODE:
1332{ 1334{
1333 PangoLayoutLine *lp; 1335 PangoLayoutLine *lp;
1334 int index, trailing; 1336 int index, trailing;
1335 1337
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1352 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1353 }
1352} 1354}
1353 1355
1354void 1356void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1357render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1358 CODE:
1357 rc_clear (self->rc); 1359 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1360 pango_opengl_render_layout_subpixel (
1359 self->pl, 1361 self->pl,
1360 self->rc, 1362 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1367 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1368 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1369 pango_layout_context_changed (self->pl);
1368 1370
1369void 1371void
1370draw (CFPlus::Layout self) 1372draw (DC::Layout self)
1371 CODE: 1373 CODE:
1372{ 1374{
1373 glEnable (GL_TEXTURE_2D); 1375 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1376 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1377 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1385 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1386 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1387 glDisable (GL_TEXTURE_2D);
1386} 1388}
1387 1389
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1390MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1391
1390PROTOTYPES: ENABLE 1392PROTOTYPES: ENABLE
1391 1393
1392void 1394void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1395pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1474 RETVAL = width > 0;
1473} 1475}
1474 OUTPUT: 1476 OUTPUT:
1475 RETVAL 1477 RETVAL
1476 1478
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1479MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1480
1479PROTOTYPES: DISABLE 1481PROTOTYPES: DISABLE
1480 1482
1481CFPlus::Map 1483DC::Map
1482new (SV *class) 1484new (SV *class)
1483 CODE: 1485 CODE:
1484 New (0, RETVAL, 1, struct map); 1486 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1487 RETVAL->x = 0;
1486 RETVAL->y = 0; 1488 RETVAL->y = 0;
1494 RETVAL->row = 0; 1496 RETVAL->row = 0;
1495 OUTPUT: 1497 OUTPUT:
1496 RETVAL 1498 RETVAL
1497 1499
1498void 1500void
1499DESTROY (CFPlus::Map self) 1501DESTROY (DC::Map self)
1500 CODE: 1502 CODE:
1501{ 1503{
1502 map_clear (self); 1504 map_clear (self);
1503 Safefree (self->face2tile); 1505 Safefree (self->face2tile);
1504 Safefree (self->tex); 1506 Safefree (self->tex);
1505 Safefree (self); 1507 Safefree (self);
1506} 1508}
1507 1509
1508void 1510void
1509resize (CFPlus::Map self, int map_width, int map_height) 1511resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1512 CODE:
1511 self->w = map_width; 1513 self->w = map_width;
1512 self->h = map_height; 1514 self->h = map_height;
1513 1515
1514void 1516void
1515clear (CFPlus::Map self) 1517clear (DC::Map self)
1516 CODE: 1518 CODE:
1517 map_clear (self); 1519 map_clear (self);
1518 1520
1519void 1521void
1520set_tileid (CFPlus::Map self, int face, int tile) 1522set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1523 CODE:
1522{ 1524{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1525 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1526 need_texid (self, tile);
1525} 1527}
1526 1528
1527void 1529void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1530set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1531 CODE:
1530{ 1532{
1531 tileid texid; 1533 tileid texid;
1532 maptex *tex; 1534 maptex *tex;
1533 1535
1546 tex->smoothtile = self->face2tile [smooth]; 1548 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1549 tex->smoothlevel = level;
1548} 1550}
1549 1551
1550void 1552void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1553set_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: 1554 CODE:
1553{ 1555{
1554 need_texid (self, texid); 1556 need_texid (self, texid);
1555 1557
1556 { 1558 {
1576 // from transparent color bleeding and ugly wrapping effects. 1578 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1580}
1579 1581
1580int 1582int
1581ox (CFPlus::Map self) 1583ox (DC::Map self)
1582 ALIAS: 1584 ALIAS:
1583 oy = 1 1585 oy = 1
1584 x = 2 1586 x = 2
1585 y = 3 1587 y = 3
1586 w = 4 1588 w = 4
1597 } 1599 }
1598 OUTPUT: 1600 OUTPUT:
1599 RETVAL 1601 RETVAL
1600 1602
1601void 1603void
1602scroll (CFPlus::Map self, int dx, int dy) 1604scroll (DC::Map self, int dx, int dy)
1603 CODE: 1605 CODE:
1604{ 1606{
1605 if (dx > 0) 1607 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1608 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1609 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1625 self->y += MAP_EXTEND_Y;
1624 } 1626 }
1625} 1627}
1626 1628
1627SV * 1629SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1630map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1631 CODE:
1630{ 1632{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1633 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1634 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1635 mapcell *cell;
1722} 1724}
1723 OUTPUT: 1725 OUTPUT:
1724 RETVAL 1726 RETVAL
1725 1727
1726SV * 1728SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1729mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1730 CODE:
1729{ 1731{
1730 int x1, x; 1732 int x1, x;
1731 int y1, y; 1733 int y1, y;
1732 int z; 1734 int z;
1777} 1779}
1778 OUTPUT: 1780 OUTPUT:
1779 RETVAL 1781 RETVAL
1780 1782
1781void 1783void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1784draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1783 CODE: 1785 CODE:
1784{ 1786{
1785 int x, y, z; 1787 int x, y, z;
1786 1788
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2058 } 2060 }
2059 } 2061 }
2060} 2062}
2061 2063
2062void 2064void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064 CODE: 2066 CODE:
2065{ 2067{
2066 static float color[16][3] = { 2068 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2069 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2070 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2120 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2121 glDisable (GL_TEXTURE_2D);
2120} 2122}
2121 2123
2122void 2124void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2125fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2126 PPCODE:
2125{ 2127{
2126 int x, y; 2128 int x, y;
2127 int sw1 = sw + 2; 2129 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2130 int sh1 = sh + 2;
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2201 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2202 PUSHs (darkness3_sv);
2201} 2203}
2202 2204
2203SV * 2205SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2206get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2207 CODE:
2206{ 2208{
2207 int x, y, x1, y1; 2209 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2210 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2211 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2274} 2276}
2275 OUTPUT: 2277 OUTPUT:
2276 RETVAL 2278 RETVAL
2277 2279
2278void 2280void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2281set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2280 PPCODE: 2282 PPCODE:
2281{ 2283{
2282 int x, y, z; 2284 int x, y, z;
2283 int w, h; 2285 int w, h;
2284 int x1, y1; 2286 int x1, y1;
2337 } 2339 }
2338 } 2340 }
2339 } 2341 }
2340} 2342}
2341 2343
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2344MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2345
2344CFPlus::RW 2346DC::RW
2345new (SV *class, SV *data_sv) 2347new (SV *class, SV *data_sv)
2346 CODE: 2348 CODE:
2347{ 2349{
2348 STRLEN datalen; 2350 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2351 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2353 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2354}
2353 OUTPUT: 2355 OUTPUT:
2354 RETVAL 2356 RETVAL
2355 2357
2356CFPlus::RW 2358DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2359new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2360 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2361 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2362 OUTPUT:
2361 RETVAL 2363 RETVAL
2362 2364
2363# fails on win32: 2365# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2366# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2367#void
2366#close (CFPlus::RW self) 2368#close (DC::RW self)
2367# CODE: 2369# CODE:
2368# (self->(close)) (self); 2370# (self->(close)) (self);
2369 2371
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2372MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2373
2372PROTOTYPES: DISABLE 2374PROTOTYPES: DISABLE
2373 2375
2374CFPlus::Channel 2376DC::Channel
2375find () 2377find ()
2376 CODE: 2378 CODE:
2377{ 2379{
2378 RETVAL = Mix_GroupAvailable (-1); 2380 RETVAL = Mix_GroupAvailable (-1);
2379 2381
2392} 2394}
2393 OUTPUT: 2395 OUTPUT:
2394 RETVAL 2396 RETVAL
2395 2397
2396void 2398void
2397halt (CFPlus::Channel self) 2399halt (DC::Channel self)
2398 CODE: 2400 CODE:
2399 Mix_HaltChannel (self); 2401 Mix_HaltChannel (self);
2400 2402
2401void 2403void
2402expire (CFPlus::Channel self, int ticks = -1) 2404expire (DC::Channel self, int ticks = -1)
2403 CODE: 2405 CODE:
2404 Mix_ExpireChannel (self, ticks); 2406 Mix_ExpireChannel (self, ticks);
2405 2407
2406void 2408void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2409fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2410 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2411 Mix_FadeOutChannel (self, ticks);
2410 2412
2411int 2413int
2412volume (CFPlus::Channel self, int volume) 2414volume (DC::Channel self, int volume)
2413 CODE: 2415 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2416 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2417 OUTPUT:
2416 RETVAL 2418 RETVAL
2417 2419
2418void 2420void
2419unregister_all_effects (CFPlus::Channel self) 2421unregister_all_effects (DC::Channel self)
2420 CODE: 2422 CODE:
2421 Mix_UnregisterAllEffects (self); 2423 Mix_UnregisterAllEffects (self);
2422 2424
2423void 2425void
2424set_panning (CFPlus::Channel self, int left, int right) 2426set_panning (DC::Channel self, int left, int right)
2425 CODE: 2427 CODE:
2426 left = CLAMP (left , 0, 255); 2428 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2429 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2430 Mix_SetPanning (self, left, right);
2429 2431
2430void 2432void
2431set_distance (CFPlus::Channel self, int distance) 2433set_distance (DC::Channel self, int distance)
2432 CODE: 2434 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2435 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2436
2435void 2437void
2436set_position (CFPlus::Channel self, int angle, int distance) 2438set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2439 CODE:
2438 2440
2439void 2441void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2443 CODE:
2442{ 2444{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2445 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); 2446 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2448}
2447 2449
2448void 2450void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2451set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2452 CODE:
2451 Mix_SetReverseStereo (self, flip); 2453 Mix_SetReverseStereo (self, flip);
2452 2454
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2456
2455PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2456 2458
2457CFPlus::MixChunk 2459DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2460new (SV *class, DC::RW rwops)
2459 CODE: 2461 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2462 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2463 OUTPUT:
2462 RETVAL 2464 RETVAL
2463 2465
2464void 2466void
2465DESTROY (CFPlus::MixChunk self) 2467DESTROY (DC::MixChunk self)
2466 CODE: 2468 CODE:
2467 Mix_FreeChunk (self); 2469 Mix_FreeChunk (self);
2468 2470
2469int 2471int
2470volume (CFPlus::MixChunk self, int volume = -1) 2472volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2473 CODE:
2472 if (items > 1) 2474 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2475 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2476 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2477 OUTPUT:
2476 RETVAL 2478 RETVAL
2477 2479
2478CFPlus::Channel 2480DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2481play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2482 CODE:
2481{ 2483{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2484 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2485
2484 if (RETVAL < 0) 2486 if (RETVAL < 0)
2491 } 2493 }
2492} 2494}
2493 OUTPUT: 2495 OUTPUT:
2494 RETVAL 2496 RETVAL
2495 2497
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2499
2498int 2500int
2499volume (int volume = -1) 2501volume (int volume = -1)
2500 PROTOTYPE: ;$ 2502 PROTOTYPE: ;$
2501 CODE: 2503 CODE:
2513void 2515void
2514halt () 2516halt ()
2515 CODE: 2517 CODE:
2516 Mix_HaltMusic (); 2518 Mix_HaltMusic ();
2517 2519
2518CFPlus::MixMusic 2520DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2521new (SV *class, DC::RW rwops)
2520 CODE: 2522 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2523 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2524 OUTPUT:
2523 RETVAL 2525 RETVAL
2524 2526
2525void 2527void
2526DESTROY (CFPlus::MixMusic self) 2528DESTROY (DC::MixMusic self)
2527 CODE: 2529 CODE:
2528 Mix_FreeMusic (self); 2530 Mix_FreeMusic (self);
2529 2531
2530int 2532int
2531play (CFPlus::MixMusic self, int loops = -1) 2533play (DC::MixMusic self, int loops = -1)
2532 CODE: 2534 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2535 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2536 OUTPUT:
2535 RETVAL 2537 RETVAL
2536 2538
2537void 2539void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2540fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2541 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2542 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2543
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2544MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2545
2544PROTOTYPES: ENABLE 2546PROTOTYPES: ENABLE
2545 2547
2546BOOT: 2548BOOT:
2547{ 2549{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2550 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2551 static const struct {
2550 const char *name; 2552 const char *name;
2551 IV iv; 2553 IV iv;
2552 } *civ, const_iv[] = { 2554 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2555# 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) 2848void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2849 CODE:
2848 if (gl.SeparableFilter2D) 2850 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2851 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2852
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2853void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2854
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2855void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2856
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2857void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2858
2882 2884
2883void glEndList () 2885void glEndList ()
2884 2886
2885void glCallList (int list) 2887void glCallList (int list)
2886 2888
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 2890
2889PROTOTYPES: DISABLE 2891PROTOTYPES: DISABLE
2890 2892
2891void 2893void
2892find_widget (SV *self, NV x, NV y) 2894find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 2898 XPUSHs (self);
2897} 2899}
2898 2900
2899BOOT: 2901BOOT:
2900{ 2902{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2903 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 2904
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2905 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2906 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2907 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2908 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 2909}
2908 2910
2909void 2911void
2910draw (SV *self) 2912draw (SV *self)
2911 CODE: 2913 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 2920 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 2921 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 2922 double draw_x, draw_y;
2921 2923
2922 if (!SvROK (self)) 2924 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2925 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 2926
2925 hv = (HV *)SvRV (self); 2927 hv = (HV *)SvRV (self);
2926 2928
2927 if (SvTYPE (hv) != SVt_PVHV) 2929 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2930 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 2931
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2932 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.; 2933 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 2934
2933 if (!h || !w) 2935 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines