ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 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)
… …
993void 993void
994error (char *message) 994error (char *message)
995 CODE: 995 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 997#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 999#endif
1000 1000
1001void 1001void
1002fatal (char *message) 1002fatal (char *message)
1003 CODE: 1003 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1005#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1007#endif
1008 _exit (1); 1008 _exit (1);
1009 1009
1010void 1010void
1011_exit (int retval = 0) 1011_exit (int retval = 0)
… …
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
1323#if !PANGO_VERSION_CHECK (1, 17. 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line;
1326#endif
1323 1327
1324 EXTEND (SP, 2); 1328 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1329 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1331}
1328 1332
1329void 1333void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1334line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1335 PPCODE:
1332{ 1336{
1333 PangoLayoutLine *lp; 1337 PangoLayoutLine *lp;
1334 int index, trailing; 1338 int index, trailing;
1335 1339
… …
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1354 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1355 }
1352} 1356}
1353 1357
1354void 1358void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1359render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1360 CODE:
1357 rc_clear (self->rc); 1361 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1362 pango_opengl_render_layout_subpixel (
1359 self->pl, 1363 self->pl,
1360 self->rc, 1364 self->rc,
… …
1365 // we assume that context_change actually clears/frees stuff 1369 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1370 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1371 pango_layout_context_changed (self->pl);
1368 1372
1369void 1373void
1370draw (CFPlus::Layout self) 1374draw (DC::Layout self)
1371 CODE: 1375 CODE:
1372{ 1376{
1373 glEnable (GL_TEXTURE_2D); 1377 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1378 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1379 glEnable (GL_BLEND);
… …
1383 glDisable (GL_ALPHA_TEST); 1387 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1388 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1389 glDisable (GL_TEXTURE_2D);
1386} 1390}
1387 1391
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1392MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1393
1390PROTOTYPES: ENABLE 1394PROTOTYPES: ENABLE
1391 1395
1392void 1396void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1397pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1472 RETVAL = width > 0; 1476 RETVAL = width > 0;
1473} 1477}
1474 OUTPUT: 1478 OUTPUT:
1475 RETVAL 1479 RETVAL
1476 1480
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1481MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1482
1479PROTOTYPES: DISABLE 1483PROTOTYPES: DISABLE
1480 1484
1481CFPlus::Map 1485DC::Map
1482new (SV *class) 1486new (SV *class)
1483 CODE: 1487 CODE:
1484 New (0, RETVAL, 1, struct map); 1488 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1489 RETVAL->x = 0;
1486 RETVAL->y = 0; 1490 RETVAL->y = 0;
… …
1494 RETVAL->row = 0; 1498 RETVAL->row = 0;
1495 OUTPUT: 1499 OUTPUT:
1496 RETVAL 1500 RETVAL
1497 1501
1498void 1502void
1499DESTROY (CFPlus::Map self) 1503DESTROY (DC::Map self)
1500 CODE: 1504 CODE:
1501{ 1505{
1502 map_clear (self); 1506 map_clear (self);
1503 Safefree (self->face2tile); 1507 Safefree (self->face2tile);
1504 Safefree (self->tex); 1508 Safefree (self->tex);
1505 Safefree (self); 1509 Safefree (self);
1506} 1510}
1507 1511
1508void 1512void
1509resize (CFPlus::Map self, int map_width, int map_height) 1513resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1514 CODE:
1511 self->w = map_width; 1515 self->w = map_width;
1512 self->h = map_height; 1516 self->h = map_height;
1513 1517
1514void 1518void
1515clear (CFPlus::Map self) 1519clear (DC::Map self)
1516 CODE: 1520 CODE:
1517 map_clear (self); 1521 map_clear (self);
1518 1522
1519void 1523void
1520set_tileid (CFPlus::Map self, int face, int tile) 1524set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1525 CODE:
1522{ 1526{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1527 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1528 need_texid (self, tile);
1525} 1529}
1526 1530
1527void 1531void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1532set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1533 CODE:
1530{ 1534{
1531 tileid texid; 1535 tileid texid;
1532 maptex *tex; 1536 maptex *tex;
1533 1537
… …
1546 tex->smoothtile = self->face2tile [smooth]; 1550 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1551 tex->smoothlevel = level;
1548} 1552}
1549 1553
1550void 1554void
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) 1555set_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: 1556 CODE:
1553{ 1557{
1554 need_texid (self, texid); 1558 need_texid (self, texid);
1555 1559
1556 { 1560 {
… …
1576 // from transparent color bleeding and ugly wrapping effects. 1580 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1582}
1579 1583
1580int 1584int
1581ox (CFPlus::Map self) 1585ox (DC::Map self)
1582 ALIAS: 1586 ALIAS:
1583 oy = 1 1587 oy = 1
1584 x = 2 1588 x = 2
1585 y = 3 1589 y = 3
1586 w = 4 1590 w = 4
… …
1597 } 1601 }
1598 OUTPUT: 1602 OUTPUT:
1599 RETVAL 1603 RETVAL
1600 1604
1601void 1605void
1602scroll (CFPlus::Map self, int dx, int dy) 1606scroll (DC::Map self, int dx, int dy)
1603 CODE: 1607 CODE:
1604{ 1608{
1605 if (dx > 0) 1609 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1610 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1611 else if (dx < 0)
… …
1623 self->y += MAP_EXTEND_Y; 1627 self->y += MAP_EXTEND_Y;
1624 } 1628 }
1625} 1629}
1626 1630
1627SV * 1631SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1632map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1633 CODE:
1630{ 1634{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1636 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1637 mapcell *cell;
… …
1722} 1726}
1723 OUTPUT: 1727 OUTPUT:
1724 RETVAL 1728 RETVAL
1725 1729
1726SV * 1730SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1731mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1732 CODE:
1729{ 1733{
1730 int x1, x; 1734 int x1, x;
1731 int y1, y; 1735 int y1, y;
1732 int z; 1736 int z;
… …
1777} 1781}
1778 OUTPUT: 1782 OUTPUT:
1779 RETVAL 1783 RETVAL
1780 1784
1781void 1785void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1786draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1783 CODE: 1787 CODE:
1784{ 1788{
1785 int x, y, z; 1789 int x, y, z;
1786 1790
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2058 } 2062 }
2059 } 2063 }
2060} 2064}
2061 2065
2062void 2066void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2067draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064 CODE: 2068 CODE:
2065{ 2069{
2066 static float color[16][3] = { 2070 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2071 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2072 { 1.00F, 1.00F, 1.00F },
… …
2118 glDisable (GL_BLEND); 2122 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2123 glDisable (GL_TEXTURE_2D);
2120} 2124}
2121 2125
2122void 2126void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2127fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2128 PPCODE:
2125{ 2129{
2126 int x, y; 2130 int x, y;
2127 int sw1 = sw + 2; 2131 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2132 int sh1 = sh + 2;
… …
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2203 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2204 PUSHs (darkness3_sv);
2201} 2205}
2202 2206
2203SV * 2207SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2208get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2209 CODE:
2206{ 2210{
2207 int x, y, x1, y1; 2211 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2212 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2213 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2274} 2278}
2275 OUTPUT: 2279 OUTPUT:
2276 RETVAL 2280 RETVAL
2277 2281
2278void 2282void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2283set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2280 PPCODE: 2284 PPCODE:
2281{ 2285{
2282 int x, y, z; 2286 int x, y, z;
2283 int w, h; 2287 int w, h;
2284 int x1, y1; 2288 int x1, y1;
… …
2337 } 2341 }
2338 } 2342 }
2339 } 2343 }
2340} 2344}
2341 2345
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2346MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2347
2344CFPlus::RW 2348DC::RW
2345new (SV *class, SV *data_sv) 2349new (SV *class, SV *data_sv)
2346 CODE: 2350 CODE:
2347{ 2351{
2348 STRLEN datalen; 2352 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2353 char *data = SvPVbyte (data_sv, datalen);
… …
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2355 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2356}
2353 OUTPUT: 2357 OUTPUT:
2354 RETVAL 2358 RETVAL
2355 2359
2356CFPlus::RW 2360DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2361new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2362 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2363 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2364 OUTPUT:
2361 RETVAL 2365 RETVAL
2362 2366
2363# fails on win32: 2367# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2368# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2369#void
2366#close (CFPlus::RW self) 2370#close (DC::RW self)
2367# CODE: 2371# CODE:
2368# (self->(close)) (self); 2372# (self->(close)) (self);
2369 2373
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2374MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2375
2372PROTOTYPES: DISABLE 2376PROTOTYPES: DISABLE
2373 2377
2374CFPlus::Channel 2378DC::Channel
2375find () 2379find ()
2376 CODE: 2380 CODE:
2377{ 2381{
2378 RETVAL = Mix_GroupAvailable (-1); 2382 RETVAL = Mix_GroupAvailable (-1);
2379 2383
… …
2392} 2396}
2393 OUTPUT: 2397 OUTPUT:
2394 RETVAL 2398 RETVAL
2395 2399
2396void 2400void
2397halt (CFPlus::Channel self) 2401halt (DC::Channel self)
2398 CODE: 2402 CODE:
2399 Mix_HaltChannel (self); 2403 Mix_HaltChannel (self);
2400 2404
2401void 2405void
2402expire (CFPlus::Channel self, int ticks = -1) 2406expire (DC::Channel self, int ticks = -1)
2403 CODE: 2407 CODE:
2404 Mix_ExpireChannel (self, ticks); 2408 Mix_ExpireChannel (self, ticks);
2405 2409
2406void 2410void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2411fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2412 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2413 Mix_FadeOutChannel (self, ticks);
2410 2414
2411int 2415int
2412volume (CFPlus::Channel self, int volume) 2416volume (DC::Channel self, int volume)
2413 CODE: 2417 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2418 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2419 OUTPUT:
2416 RETVAL 2420 RETVAL
2417 2421
2418void 2422void
2419unregister_all_effects (CFPlus::Channel self) 2423unregister_all_effects (DC::Channel self)
2420 CODE: 2424 CODE:
2421 Mix_UnregisterAllEffects (self); 2425 Mix_UnregisterAllEffects (self);
2422 2426
2423void 2427void
2424set_panning (CFPlus::Channel self, int left, int right) 2428set_panning (DC::Channel self, int left, int right)
2425 CODE: 2429 CODE:
2426 left = CLAMP (left , 0, 255); 2430 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2431 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2432 Mix_SetPanning (self, left, right);
2429 2433
2430void 2434void
2431set_distance (CFPlus::Channel self, int distance) 2435set_distance (DC::Channel self, int distance)
2432 CODE: 2436 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2437 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2438
2435void 2439void
2436set_position (CFPlus::Channel self, int angle, int distance) 2440set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2441 CODE:
2438 2442
2439void 2443void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2445 CODE:
2442{ 2446{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2447 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); 2448 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2450}
2447 2451
2448void 2452void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2453set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2454 CODE:
2451 Mix_SetReverseStereo (self, flip); 2455 Mix_SetReverseStereo (self, flip);
2452 2456
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2458
2455PROTOTYPES: DISABLE 2459PROTOTYPES: DISABLE
2456 2460
2457CFPlus::MixChunk 2461DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2462new (SV *class, DC::RW rwops)
2459 CODE: 2463 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2464 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2465 OUTPUT:
2462 RETVAL 2466 RETVAL
2463 2467
2464void 2468void
2465DESTROY (CFPlus::MixChunk self) 2469DESTROY (DC::MixChunk self)
2466 CODE: 2470 CODE:
2467 Mix_FreeChunk (self); 2471 Mix_FreeChunk (self);
2468 2472
2469int 2473int
2470volume (CFPlus::MixChunk self, int volume = -1) 2474volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2475 CODE:
2472 if (items > 1) 2476 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2477 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2478 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2479 OUTPUT:
2476 RETVAL 2480 RETVAL
2477 2481
2478CFPlus::Channel 2482DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2483play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2484 CODE:
2481{ 2485{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2486 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2487
2484 if (RETVAL < 0) 2488 if (RETVAL < 0)
… …
2491 } 2495 }
2492} 2496}
2493 OUTPUT: 2497 OUTPUT:
2494 RETVAL 2498 RETVAL
2495 2499
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2501
2498int 2502int
2499volume (int volume = -1) 2503volume (int volume = -1)
2500 PROTOTYPE: ;$ 2504 PROTOTYPE: ;$
2501 CODE: 2505 CODE:
… …
2513void 2517void
2514halt () 2518halt ()
2515 CODE: 2519 CODE:
2516 Mix_HaltMusic (); 2520 Mix_HaltMusic ();
2517 2521
2518CFPlus::MixMusic 2522DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2523new (SV *class, DC::RW rwops)
2520 CODE: 2524 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2525 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2526 OUTPUT:
2523 RETVAL 2527 RETVAL
2524 2528
2525void 2529void
2526DESTROY (CFPlus::MixMusic self) 2530DESTROY (DC::MixMusic self)
2527 CODE: 2531 CODE:
2528 Mix_FreeMusic (self); 2532 Mix_FreeMusic (self);
2529 2533
2530int 2534int
2531play (CFPlus::MixMusic self, int loops = -1) 2535play (DC::MixMusic self, int loops = -1)
2532 CODE: 2536 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2537 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2538 OUTPUT:
2535 RETVAL 2539 RETVAL
2536 2540
2537void 2541void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2542fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2543 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2544 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2545
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2546MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2547
2544PROTOTYPES: ENABLE 2548PROTOTYPES: ENABLE
2545 2549
2546BOOT: 2550BOOT:
2547{ 2551{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2552 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2553 static const struct {
2550 const char *name; 2554 const char *name;
2551 IV iv; 2555 IV iv;
2552 } *civ, const_iv[] = { 2556 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2557# 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) 2850void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2851 CODE:
2848 if (gl.SeparableFilter2D) 2852 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2853 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2854
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2855void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2856
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2857void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2858
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2859void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2860
… …
2882 2886
2883void glEndList () 2887void glEndList ()
2884 2888
2885void glCallList (int list) 2889void glCallList (int list)
2886 2890
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 2892
2889PROTOTYPES: DISABLE 2893PROTOTYPES: DISABLE
2890 2894
2891void 2895void
2892find_widget (SV *self, NV x, NV y) 2896find_widget (SV *self, NV x, NV y)
… …
2896 XPUSHs (self); 2900 XPUSHs (self);
2897} 2901}
2898 2902
2899BOOT: 2903BOOT:
2900{ 2904{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2905 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 2906
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2907 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); 2908 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); 2909 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); 2910 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 2911}
2908 2912
2909void 2913void
2910draw (SV *self) 2914draw (SV *self)
2911 CODE: 2915 CODE:
… …
2918 SV *draw_w_sv = GvSV (draw_w_gv); 2922 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 2923 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 2924 double draw_x, draw_y;
2921 2925
2922 if (!SvROK (self)) 2926 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2927 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 2928
2925 hv = (HV *)SvRV (self); 2929 hv = (HV *)SvRV (self);
2926 2930
2927 if (SvTYPE (hv) != SVt_PVHV) 2931 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2932 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 2933
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2934 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.; 2935 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 2936
2933 if (!h || !w) 2937 if (!h || !w)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines